diff --git a/src/audio/AudioManager.java b/src/audio/AudioManager.java
index 4a26cecc..8783e00e 100644
--- a/src/audio/AudioManager.java
+++ b/src/audio/AudioManager.java
@@ -326,6 +326,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
 
 			endAllAudioAssignments();
 			
+			mChannelAssignments.clear();
 			mAvailableAudioOutputs.clear();
 			mChannelNames.clear();
 			mAudioOutputMap.clear();
diff --git a/src/controller/channel/Channel.java b/src/controller/channel/Channel.java
index 9d50da47..5a2e77f3 100644
--- a/src/controller/channel/Channel.java
+++ b/src/controller/channel/Channel.java
@@ -714,7 +714,7 @@ public class Channel extends Configuration
 			}
 			catch( SourceException se )
 			{
-				mLog.error( "Error obtaining source for channel" );
+				mLog.info( "Couldn't obtain source for channel [" + mName + "]" );
 			}
 		}
 	}