diff --git a/main/manager.c b/main/manager.c
index 998942605f90d0ad4c1cd70ca59cac1544e21646..e7cf931e1cd1ae9447fca42d61c95424d1f4be4d 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -980,7 +980,7 @@ static const struct permalias {
 	{ EVENT_FLAG_DIALPLAN, "dialplan" },
 	{ EVENT_FLAG_ORIGINATE, "originate" },
 	{ EVENT_FLAG_AGI, "agi" },
-	{ -1, "all" },
+	{ INT_MAX, "all" },
 	{ 0, "none" },
 };
 
@@ -1062,7 +1062,7 @@ static int strings_to_mask(const char *string)
 			break;
 		}
 	}
-	if (!p)	{ /* all digits */
+	if (!*p) { /* all digits */
 		return atoi(string);
 	}
 	if (ast_false(string)) {