Add null check
Add more information to timeout message