Timeout

Timout added for better error handling