Better error handling
Smaller wait time