diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index d6f140ea74..30801807d6 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -22,10 +22,10 @@
 #include <SimpleMovingAverage.h>
 #include <shared/RateCounter.h>
 #include <avatars-renderer/ScriptAvatar.h>
+#include <AudioInjector.h>
 
 #include "AvatarMotionState.h"
 #include "MyAvatar.h"
-#include "AudioInjector.h"
 
 
 class AvatarManager : public AvatarHashMap {
diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index 1b16a28546..9276461783 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -422,7 +422,7 @@ void AudioInjector::triggerDeleteAfterFinish() {
 AudioInjectorPointer AudioInjector::playSound(SharedSoundPointer sound, const float volume,
                                               const float stretchFactor, const glm::vec3 position) {
     if (!sound || !sound->isReady()) {
-        return AudioInjectorPointer(nullptr);
+        return AudioInjectorPointer();
     }
 
     AudioInjectorOptions options;