diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index 4e8f685b3..24634f2b5 100644
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -35,6 +35,9 @@
 #define SS_RC_DAEMON_INTEGRITY			65
 #define SS_RC_INITIALIZATION_FAILED		66
 
+#define SS_RC_FIRST	SS_RC_LIBSTRONGSWAN_INTEGRITY
+#define SS_RC_LAST	SS_RC_INITIALIZATION_FAILED
+
 /**
  * Number of bits in a byte
  */
diff --git a/src/starter/starter.c b/src/starter/starter.c
index 72421ca96..b675ccf1c 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -103,8 +103,7 @@ static void fsig(int signal)
 				else if (WIFEXITED(status))
 				{
 					exit_status =  WEXITSTATUS(status);
-					if (exit_status >= SS_RC_LIBSTRONGSWAN_INTEGRITY &&
-						exit_status <= SS_RC_INITIALIZATION_FAILED)
+					if (exit_status >= SS_RC_FIRST && exit_status <= SS_RC_LAST)
 					{
 						_action_ =  FLAG_ACTION_QUIT;
 					}