[FEATURE] Add basic error handling