Refactored to method level rescue

[method level rescue](http://seejohncode.com/2012/04/17/short-tip-rescuing-a-method-in-ruby/)