X-Git-Url: http://nitlanguage.org

diff --git a/src/mmloader.nit b/src/mmloader.nit
index 9d28ff2..b25db16 100644
--- a/src/mmloader.nit
+++ b/src/mmloader.nit
@@ -76,8 +76,15 @@ class Message
 			else
 				cend = location.column_end
 			end
-			var lmid = string.substring(line_start + location.column_start - 1, cend - location.column_start + 1)
-			var lend = string.substring(line_start + cend, line_end - line_start - cend + 1)
+			var lmid
+			var lend
+			if line_start + cend <= string.length then
+				lmid = string.substring(line_start + location.column_start - 1, cend - location.column_start + 1)
+				lend = string.substring(line_start + cend, line_end - line_start - cend + 1)
+			else
+				lmid = ""
+				lend = ""
+			end
 			var indent = new Buffer
 			for j in [line_start..line_start+location.column_start-1[ do
 				if string[j] == '\t' then
@@ -252,7 +259,7 @@ class ToolContext
 	private fun try_to_load(module_name: Symbol, dir: MMDirectory): nullable MMModule
 	do
 		# Look in the module directory
-		for m in dir.modules do
+		for m in dir.modules.values do
 			if m.name == module_name then return m
 		end