Restored crypter saving, added more error handling