diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index 2af9ac49..03f17ed2 100644
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -1772,7 +1772,7 @@ void LightWorld( void ){
 		SetupEnvelopes( qfalse, fastbounce );
 		if ( numLights == 0 ) {
 			Sys_Printf( "No diffuse light to calculate, ending radiosity.\n" );
-			break;
+			return;
 		}
 
 		/* add to lightgrid */
@@ -1813,6 +1813,9 @@ void LightWorld( void ){
 		bounce--;
 		b++;
 	}
+	/* ydnar: store off lightmaps */
+	StoreSurfaceLightmaps();
+
 }
 
 
@@ -2301,9 +2304,6 @@ int LightMain( int argc, char **argv ){
 	/* light the world */
 	LightWorld();
 
-	/* ydnar: store off lightmaps */
-	StoreSurfaceLightmaps();
-
 	/* write out the bsp */
 	UnparseEntities();
 	Sys_Printf( "Writing %s\n", source );