Fixed a small crash issue and removed a stupid line :P