General: Fixed previous crash in a better way