error handling
fix