diff --git a/NewHorizons/Builder/Body/CloakBuilder.cs b/NewHorizons/Builder/Body/CloakBuilder.cs
index ab18f6bf..ddb60013 100644
--- a/NewHorizons/Builder/Body/CloakBuilder.cs
+++ b/NewHorizons/Builder/Body/CloakBuilder.cs
@@ -12,16 +12,26 @@ namespace NewHorizons.Builder.Body
             var radius = module.radius;
 
             AudioClip clip = null;
-            if (module.audioClip != null) clip = SearchUtilities.FindResourceOfTypeAndName<AudioClip>(module.audioClip);
-            else if (module.audioFilePath != null)
+            if (!string.IsNullOrEmpty(module.audioClip))
+            {
+                clip = SearchUtilities.FindResourceOfTypeAndName<AudioClip>(module.audioClip);
+
+                if (clip == null)
+                {
+                    Utility.Logger.LogError($"Couldn't get audio from clip [{module.audioClip}]");
+                }
+            }
+            else if (!string.IsNullOrEmpty(module.audioFilePath))
             {
                 try
                 {
                     clip = AudioUtilities.LoadAudio(mod.ModHelper.Manifest.ModFolderPath + "/" + module.audioFilePath);
                 }
-                catch (System.Exception e)
+                catch { }
+
+                if (clip == null)
                 {
-                    Utility.Logger.LogError($"Couldn't load audio file {module.audioFilePath} : {e.Message}");
+                    Utility.Logger.LogError($"Couldn't get audio from file [{module.audioFilePath}]");
                 }
             }
 
diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs
index 097ea6cb..856e57d6 100644
--- a/NewHorizons/Builder/Props/SignalBuilder.cs
+++ b/NewHorizons/Builder/Props/SignalBuilder.cs
@@ -153,17 +153,14 @@ namespace NewHorizons.Builder.Props
             var name = StringToSignalName(info.name);
 
             AudioClip clip = null;
-            if (info.audioClip != null) clip = SearchUtilities.FindResourceOfTypeAndName<AudioClip>(info.audioClip);
-            else if (info.audioFilePath != null)
+            if (!string.IsNullOrEmpty(info.audioClip)) clip = SearchUtilities.FindResourceOfTypeAndName<AudioClip>(info.audioClip);
+            else if (!string.IsNullOrEmpty(info.audioFilePath))
             {
                 try
                 {
                     clip = AudioUtilities.LoadAudio(mod.ModHelper.Manifest.ModFolderPath + "/" + info.audioFilePath);
                 }
-                catch (Exception e)
-                {
-                    Logger.LogError($"Couldn't load audio file {info.audioFilePath} : {e.Message}");
-                }
+                catch { }
             }
 
             if (clip == null)
diff --git a/NewHorizons/Handlers/SystemCreationHandler.cs b/NewHorizons/Handlers/SystemCreationHandler.cs
index 6eb51621..af59fb81 100644
--- a/NewHorizons/Handlers/SystemCreationHandler.cs
+++ b/NewHorizons/Handlers/SystemCreationHandler.cs
@@ -54,12 +54,15 @@ namespace NewHorizons.Handlers
 
             if (clip != null)
             {
-                var travelSource = Locator.GetGlobalMusicController()._travelSource;
-                travelSource._audioLibraryClip = AudioType.None;
-                travelSource._clipArrayIndex = 0;
-                travelSource._clipArrayLength = 0;
-                travelSource._clipSelectionOnPlay = OWAudioSource.ClipSelectionOnPlay.MANUAL;
-                travelSource.clip = clip;
+                Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() =>
+                {
+                    var travelSource = Locator.GetGlobalMusicController()._travelSource;
+                    travelSource._audioLibraryClip = AudioType.None;
+                    travelSource._clipArrayIndex = 0;
+                    travelSource._clipArrayLength = 0;
+                    travelSource._clipSelectionOnPlay = OWAudioSource.ClipSelectionOnPlay.MANUAL;
+                    travelSource.clip = clip;
+                });
             }
         }
     }