Crash Safer

There were extremely frequent crashes on some systems, which have now been fixed. Thanks again to “theRatt!”