FIX: stop creating empty requests on time out