exception catching fix
oopsie
fixed tests