Refactored error handling and classes