Good idea. I have added a timeout of 30 seconds.