This removes a TODO, that was not possible before the consumer code refactoring. Now, we can just catch the right exception instead of catching everything and pray. Change-Id: Id6203d79d4b2f027e5c6cd952c99fcd0967ecb3c