diff --git a/regexp/jimregexp.c b/regexp/jimregexp.c
index 7fd6d473e..91be38f22 100644
--- a/regexp/jimregexp.c
+++ b/regexp/jimregexp.c
@@ -778,7 +778,7 @@ static int regatom(regex_t *preg, int *flagp)
 							preg->err = REG_ERR_NULL_CHAR;
 							return 0;
 						}
-						if (start == '\\' && *pattern == 0) {
+						if (end == '\\' && *pattern == 0) {
 							preg->err = REG_ERR_INVALID_ESCAPE;
 							return 0;
 						}
@@ -795,7 +795,8 @@ static int regatom(regex_t *preg, int *flagp)
 
 					for (cc = 0; cc < CC_NUM; cc++) {
 						n = strlen(character_class[cc]);
-						if (strncmp(pattern, character_class[cc], n) == 0) {
+						if (!strncmp(pattern, character_class[cc], n)
+                                                    && pattern[n] == ']') {
 							/* Found a character class */
 							pattern += n + 1;
 							break;