diff --git a/NEWS b/NEWS
index 3ef0933c..a69e48ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 * Fullscreen support (hide toolbar and tray) and tray support in activity 
 window (erikos)
 
+Snapshot b023dd17a2
+
+* Fix a crash in the emulator (marco)
+
 Snapshot 276e1ee517
 
 * #4266 Avoid misleading warning every time an activity starts (smcv)
diff --git a/shell/hardware/hardwaremanager.py b/shell/hardware/hardwaremanager.py
index 79b932f2..4eeac033 100644
--- a/shell/hardware/hardwaremanager.py
+++ b/shell/hardware/hardwaremanager.py
@@ -45,7 +45,7 @@ class HardwareManager(object):
         self._mixer = gst.element_factory_make('alsamixer')
         self._mixer.set_state(gst.STATE_PAUSED)
 
-
+        self._master = None
         for track in self._mixer.list_tracks():
             if track.flags & gst.interfaces.MIXER_TRACK_MASTER:
                 self._master = track