1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/server.c b/src/server/server.c
index ffa817f..dd71312 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -286,9 +286,11 @@ int main(int argc, char *argv[])
 
 	logadd( LOG_INFO, "Loading images...." );
 	// Load all images in base path
-	if ( !image_loadAll( NULL ) ) {
+	if ( !image_loadAll( NULL ) || _shutdown ) {
 		logadd( LOG_ERROR, "Could not load images." );
-		return EXIT_FAILURE;
+		free( bindAddress );
+		dnbd3_cleanup();
+		return 0;
 	}
 
 	startupTime = time( NULL );