Removed blanket excepts plus added some tests to verify

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