General: Fixed possible crash