Squash me.  Fixed repository and tests to handle None responses instead of exceptions thrown.

Change-Id: Icb6d5a8805f1084f80f080b7babcd0cffb47f40e