-make error message on timeout more consistent to allow tests to pass