Code not crashing anymore.