Refactored old syntax
Rescue exception fails otherwise