changed timeout and error