Change timeout
Add null checks