Pull request - 08-25-2014

First code review
Avoid rescuing the `Exception` class.<br>Useless assignment to variable - `e`.