correct error handling issue #210