fixes #2959 - Error handling