diff --git a/.github/scripts/preLoading.st b/.github/scripts/preLoading.st
index 61a2d00..248cc64 100644
--- a/.github/scripts/preLoading.st
+++ b/.github/scripts/preLoading.st
@@ -1,4 +1,2 @@
 IceRepository registry remove: (IceRepository repositoryNamed: #tonel).
-#( 'BaselineOfTonel' ) do: [ :each | 
-	(RPackageOrganizer default packageNamed: each ifAbsent: [ nil ]) 
-		ifNotNil: [ :aPackage | aPackage removeFromSystem ] ]
+#( 'BaselineOfTonel' ) do: [ :each | (each asPackageIfAbsent: [ nil ]) ifNotNil: #removeFromSystem ]
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4b76d02
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+
+**/.DS_Store
+
diff --git a/MonticelloTonel-Core.package/TonelReader.class/instance/loadDefinitions.st b/MonticelloTonel-Core.package/TonelReader.class/instance/loadDefinitions.st
index 46bf506..7dacd89 100644
--- a/MonticelloTonel-Core.package/TonelReader.class/instance/loadDefinitions.st
+++ b/MonticelloTonel-Core.package/TonelReader.class/instance/loadDefinitions.st
@@ -3,9 +3,10 @@ loadDefinitions
 
 	| definitionOrders newDefinitions tagNames |
 	definitionOrders := self class definitionOrders.
-	newDefinitions := ((self packageDirectory entries select: [ :each | self canBeLoaded: each ]) collect: [ :each |
-		                   each readStreamDo: [ :s | TonelParser parseStream: s ] ]) flattened sort: [ :a :b |
-		                  (definitionOrders at: a class) < (definitionOrders at: b class) ].
+
+	newDefinitions := ((self packageDirectory entries select: [ :file | self canBeLoaded: file ]) collect: [ :file | self parseTonelFile: file ]) flattened sort: [
+		                  :a
+		                  :b | (definitionOrders at: a class) < (definitionOrders at: b class) ].
 
 	self ensurePackagesAndTagsOfDefinitions: newDefinitions.
 
diff --git a/MonticelloTonel-Core.package/TonelReader.class/instance/parseTonelFile..st b/MonticelloTonel-Core.package/TonelReader.class/instance/parseTonelFile..st
new file mode 100644
index 0000000..8433995
--- /dev/null
+++ b/MonticelloTonel-Core.package/TonelReader.class/instance/parseTonelFile..st
@@ -0,0 +1,9 @@
+loading
+parseTonelFile: file
+	"In case of error we add the info of the file that produced the error for a better debugging experience."
+
+	^ [ file readStreamDo: [ :aStream | TonelParser parseStream: aStream ] ]
+		  on: TonelParseError
+		  do: [ :error |
+			  error messageText: 'Error while parsing ' , file basename , ': ' , error messageText.
+			  error pass ]
\ No newline at end of file