fix for better error handling