Bug 1332795: raise appropriate error when invalid tenant id is passed
Bug 1332796: Raise correct error
Merge pull request #73 from Juniper/sb

Bug 1332795: raise appropriate error when invalid tenant id is passed