Small fix

Made doors not continually crash servers, now they close if something
breaks.
Merge remote-tracking branch 'upstream/master'