Update exception handlers to get more specific error messages (#209)
Remove duplicate statement (#209)