Remove duplicated exception handling

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>