Removed rescue block

Need to handle this better,