FB 5143. was blowing up with a NPE when trying to get disk size on
listProducts. Relates to FB 5133 as well.
Merge pull request #153 from unwin/2014.08_FB_5133

FB 5143. was blowing up with a NPE when trying to get disk size on