diff --git a/src/group.c b/src/group.c
index 487beb62f..8c8ff8c05 100644
--- a/src/group.c
+++ b/src/group.c
@@ -208,8 +208,8 @@ void grpLeave(DROID_GROUP *psGroup, DROID *psDroid)
 {
 	DROID	*psPrev, *psCurr;
 
-	ASSERT(grpInitialized, "Group code not initialized yet");
-	ASSERT( psGroup != NULL,
+	ASSERT_OR_RETURN(false, grpInitialized, "Group code not initialized yet");
+	ASSERT_OR_RETURN(false, psGroup != NULL,
 		"grpLeave: invalid group pointer" );
 
 	if (psDroid != NULL && psDroid->psGroup != psGroup)