Crashes fix

Fixed these crashes and errors, thank you for the feedback!
Try it and if something goes wrong tell us here.