Bug 927568 - fix misplaced null check in marionette-server.js, r=mdas