Further tweaks to timeout error throws