shorten timeout, check for null