diff --git a/include/chaiscript/language/chaiscript_parser.hpp b/include/chaiscript/language/chaiscript_parser.hpp
index 835cdd8..37af242 100644
--- a/include/chaiscript/language/chaiscript_parser.hpp
+++ b/include/chaiscript/language/chaiscript_parser.hpp
@@ -145,7 +145,7 @@ namespace chaiscript
                     ++input_pos;
                     ++col;
                 }
-                if (*input_pos == '.') {
+                if ((input_pos != input_end) && (*input_pos == '.')) {
                     ++input_pos;
                     ++col;
                     if ((input_pos != input_end) && (*input_pos >= '0') && (*input_pos <= '9')) {