check that controlURI is set and don't wait longer than needed
Merge pull request #138 from arankin/master

check that controlURI is set and don't wait longer than needed