Adding throwExceptionOnTimeout feature