diff --git a/src/org/jitsi/impl/neomedia/maccoreaudio/CoreAudioVolumeControl.java b/src/org/jitsi/impl/neomedia/maccoreaudio/CoreAudioVolumeControl.java
index 873653501d3deda9e3556f0cf63e8a5acb4d592f..d8ed08966a960c7cdfcfad49844efe1371cd3992 100644
--- a/src/org/jitsi/impl/neomedia/maccoreaudio/CoreAudioVolumeControl.java
+++ b/src/org/jitsi/impl/neomedia/maccoreaudio/CoreAudioVolumeControl.java
@@ -51,6 +51,11 @@ public CoreAudioVolumeControl(
      */
     protected int setInputDeviceVolume(String deviceUID, float volume)
     {
+        if(deviceUID == null)
+        {
+            return -1;
+        }
+
         // Changes the input volume of the capture device.
         if(CoreAudioDevice.setInputDeviceVolume(deviceUID, volume) != 0)
         {
@@ -71,6 +76,11 @@ protected int setInputDeviceVolume(String deviceUID, float volume)
      */
     protected float getInputDeviceVolume(String deviceUID)
     {
+        if(deviceUID == null)
+        {
+            return -1;
+        }
+
         float volume = CoreAudioDevice.getInputDeviceVolume(deviceUID);
 
         if(logger.isDebugEnabled() && (volume != 0))
diff --git a/src/org/jitsi/impl/neomedia/wincoreaudio/CoreAudioVolumeControl.java b/src/org/jitsi/impl/neomedia/wincoreaudio/CoreAudioVolumeControl.java
index e6052abdacb61c2dd3cae6082db351d74756b2a4..d64acd9f4b6ac1c54a3d570072ab7add2145c50d 100644
--- a/src/org/jitsi/impl/neomedia/wincoreaudio/CoreAudioVolumeControl.java
+++ b/src/org/jitsi/impl/neomedia/wincoreaudio/CoreAudioVolumeControl.java
@@ -51,6 +51,11 @@ public CoreAudioVolumeControl(
      */
     protected int setInputDeviceVolume(String deviceUID, float volume)
     {
+        if(deviceUID == null)
+        {
+            return -1;
+        }
+
         if(CoreAudioDevice.initDevices() == -1)
         {
             CoreAudioDevice.freeDevices();
@@ -83,6 +88,11 @@ protected float getInputDeviceVolume(String deviceUID)
     {
         float volume;
 
+        if(deviceUID == null)
+        {
+            return -1;
+        }
+
         if(CoreAudioDevice.initDevices() == -1)
         {
             CoreAudioDevice.freeDevices();