reverted unused error handling