return null rather than exception when vm not found. fixes a test.
Merge pull request #221 from unwin/develop-ROGER-RDS-TEST

return null rather than exception when vm not found. fixes a test.