diff --git a/src/config/Tokenizer.cpp b/src/config/Tokenizer.cpp
index 23c25f3..0bfce2a 100644
--- a/src/config/Tokenizer.cpp
+++ b/src/config/Tokenizer.cpp
@@ -38,6 +38,15 @@ namespace config
 		else
 			return (false);
 	}
+
+	bool istomlmapdecl(char c)
+	{
+		if (isalnum(c) || c == '-' || c == '_' || c == '.')
+			return (true);
+		else
+			return (false);
+	}
+
 	Tokenizer::Tokenizer(char *filename)
 	{
 		last_token = NO_TOK;
@@ -99,7 +108,7 @@ namespace config
 			{
 				token.type = MAPARRAY_DECL;
 				file.get(c);
-				while (c != ']')
+				while (c != ']' && config::istomlmapdecl(c))
 				{
 					token.value += c;
 					file.get(c);
@@ -107,7 +116,7 @@ namespace config
 				if (c == ']')
 					file.get(c);
 				if (c != ']')
-					throw std::logic_error("error in MAPARRAY_DECL");
+					throw InvalidToken("[[" + token.value);
 			}
 			else
 			{
@@ -120,7 +129,8 @@ namespace config
 					file.get(c);
 				}
 				if (c != ']')
-					throw std::logic_error("malformed MAP_DECL");
+					// throw std::logic_error("malformed MAP_DECL");
+					throw InvalidToken(token.value);
 			}
 		}
 		else if (c == '[')
@@ -233,6 +243,16 @@ namespace config
 				token.type = NEWLINE;
 
 		}
+		else
+		{
+			while (!config::isspace(c) && (c != '\n'))
+			{
+				DBOUT << RED << "[" << c << "]" <<ENDL;
+				token.value += c;
+				file.get(c);
+			}
+			throw InvalidToken(token.value);
+		}
 		last_token = token.type;
 
 		DBOUT << YELLO << "GOT " << token.value << ", type: " << token.type << ENDL;
diff --git a/src/config/Tokenizer.hpp b/src/config/Tokenizer.hpp
index dcddc8d..3c7427b 100644
--- a/src/config/Tokenizer.hpp
+++ b/src/config/Tokenizer.hpp
@@ -43,6 +43,8 @@ namespace config
 
 	bool istomlkey(char c);
 
+	bool istomlmapdecl(char c);
+
 	class Tokenizer
 	{
 		private: