Please submit this as a separate pull request just for adding a timeout.