diff --git a/src/Core/OOMusicController.m b/src/Core/OOMusicController.m
index f78cab22..ac1d74e8 100644
--- a/src/Core/OOMusicController.m
+++ b/src/Core/OOMusicController.m
@@ -91,9 +91,17 @@ enum
 	
 	if (_mode == kOOMusicOn)
 	{
-		_current = [[ResourceManager ooMusicNamed:name inFolder:@"Music"] retain];
-		if (loop)  [_current playLooped];
-		else  [_current play];
+		OOMusic *music = [ResourceManager ooMusicNamed:name inFolder:@"Music"];
+		if (music != nil)
+		{
+			[_current stop];
+			
+			if (loop)  [music playLooped];
+			else  [music play];
+			
+			[_current release];
+			_current = [music retain];
+		}
 	}
 }