Crash fixes

Bastien Nocerarequested to merge
(removed):wip/hadess/crash-fixes into master

Crasher fixes that go on top of !1 (closed)

Merge request reports