Better handling of failed requests
Avoid death by a thousand functions