Little touch in area of error handling