Add null check
Add more information to timeout message
Merge pull request #55 from bitsquare/master

Add a null check and more inforamtion for timeout message