diff --git a/src/PulseAudioManager.vala b/src/PulseAudioManager.vala
index f721f04e..1f213ec0 100644
--- a/src/PulseAudioManager.vala
+++ b/src/PulseAudioManager.vala
@@ -466,8 +466,12 @@ public class Sound.PulseAudioManager : GLib.Object {
                 device.card_source_index = (int)source.index;
                 device.card_source_name = source.name;
                 debug ("\t\t\tdevice.card_source_name: %s", device.card_source_name);
-                if (source.active_port != null && device.port_name == source.active_port.name) {
+
+                if (source.active_port != null) {
                     device.card_source_port_name = source.active_port.name;
+                }
+
+                if (source.active_port != null && device.port_name == source.active_port.name) {
                     device.source_name = source.name;
                     debug ("\t\t\tdevice.source_name: %s", device.card_source_name);
                     device.source_index = (int)source.index;
@@ -535,8 +539,11 @@ public class Sound.PulseAudioManager : GLib.Object {
                 device.card_sink_name = sink.name;
                 debug ("\t\t\tdevice.card_sink_name: %s", device.card_sink_name);
 
-                if (sink.active_port != null && device.port_name == sink.active_port.name) {
+                if (sink.active_port != null) {
                     device.card_sink_port_name = sink.active_port.name;
+                }
+
+                if (sink.active_port != null && device.port_name == sink.active_port.name) {
                     device.sink_name = sink.name;
                     debug ("\t\t\tdevice.sink_name: %s", device.card_sink_name);
                     device.sink_index = (int)sink.index;