Requesting a pull to mozillafordevelopment:master from k88hudson:92

Cool. We need safety checks like this in a few other places as well (play & edit most notably).