Fixed #5 (error messages on timeouts)