Removed more changes on spawn error