diff --git a/src/charon/sa/connect_manager.c b/src/charon/sa/connect_manager.c
index d583e01bb..01ece7457 100644
--- a/src/charon/sa/connect_manager.c
+++ b/src/charon/sa/connect_manager.c
@@ -1240,7 +1240,8 @@ static job_requeue_t initiate_mediated(initiate_data_t *data)
 	}
 	else
 	{
-		// this should (can?) not happen
+		/* this should (can?) not happen */
+		return JOB_REQUEUE_NONE;
 	}
 }
 
diff --git a/src/pluto/connections.c b/src/pluto/connections.c
index 8350c682b..2f0778ffe 100644
--- a/src/pluto/connections.c
+++ b/src/pluto/connections.c
@@ -955,6 +955,7 @@ gen_reqid(void)
     } while (reqid != start);
 
     exit_log("unable to allocate reqid");
+    return 0; /* never reached ... */
 }
 
 void