reworking error handling