
Moving the exception didn't cause problems in I925ed62bdc808f0e07862f6e0905e80b50fbe942, but in later changes where we split blockdevice.py up a bit more, we can get a bit tangled with circular imports. Change-Id: I8297483f64c4e1deecd5ec88ee40e9198bb83589