diff --git a/alib2str/src/automaton/AutomatonFromStringLexer.cpp b/alib2str/src/automaton/AutomatonFromStringLexer.cpp
index 8e1401147ebc72904dfc8fbda057c91f26e769ce..c8f70f35a6a2ba97c14f094570fdde5002828a1f 100644
--- a/alib2str/src/automaton/AutomatonFromStringLexer.cpp
+++ b/alib2str/src/automaton/AutomatonFromStringLexer.cpp
@@ -78,6 +78,7 @@ L0:
 	} else {
 		in.clear();
 		putback(in, token);
+		token.raw = "";
 		token.type = TokenType::ERROR;
 		return token;
 	}
@@ -95,6 +96,7 @@ L1:
 		in.clear ( );
 		in.unget ( );
 		putback(in, token);
+		token.raw = "";
 		token.type = TokenType::ERROR;
 		return token;
 	}
diff --git a/alib2str/src/registration/StringRegistration.hpp b/alib2str/src/registration/StringRegistration.hpp
index 2e472c97900a0b40ea331bb71ab14095811661b7..c8d405a728e06e1740743b198102d5a98ba2db97 100644
--- a/alib2str/src/registration/StringRegistration.hpp
+++ b/alib2str/src/registration/StringRegistration.hpp
@@ -1,5 +1,5 @@
-#ifndef _TYPE_REGISTRATION_HPP_
-#define _TYPE_REGISTRATION_HPP_
+#ifndef _STRING_REGISTRATION_HPP_
+#define _STRING_REGISTRATION_HPP_
 
 #include <core/xmlApi.hpp>
 
@@ -55,4 +55,4 @@ public:
 
 } /* namespace registration */
 
-#endif // _TYPE_REGISTRATION_HPP_
+#endif // _STRING_REGISTRATION_HPP_