am a16b0f4c: Merge "The generic failure case disappeared..."

* commit 'a16b0f4c3a7b6546690cbdbd3d63b5cdd2da4149':
  The generic failure case disappeared...