diff --git a/src/buildvalue.c b/src/buildvalue.c
index 6df12d4..289ddde 100644
--- a/src/buildvalue.c
+++ b/src/buildvalue.c
@@ -230,8 +230,6 @@ static Object *walkValue(const char *fmt, int *i, va_list va, Heap *heap, Error
 				
 				const char *src = fmt + start;
 				int         len = end - start;
-
-				printf("src: [%.*s]\n", len, src);
 				
 				o = eval(src, len, NULL, heap, error);
 
diff --git a/src/compiler/parse.c b/src/compiler/parse.c
index 7b412db..5c12c2a 100644
--- a/src/compiler/parse.c
+++ b/src/compiler/parse.c
@@ -151,7 +151,7 @@ static Token *tokenize(Source *src, BPAlloc *alloc, Error *error)
 					while(i < len && isspace(str[i]))
 						i += 1;
 
-					if(str[i] == '#')
+					if(i < len && str[i] == '#')
 						{
 							i += 1;