better error handling -> more changes are coming