Catch another breakage, when cinder is unavailable

During review of backporting avoid cinder calls, this
has been discovered and should be applied to master branch.

Fixes bug 1098146

Change-Id: I74c7fabd31ed333fc9f44ec92b2c391dd7c9b9ef
Merge "Catch another breakage, when cinder is unavailable"