Fix typos in unexecuted code paths

Change-Id: I28f1d4d29ef5a15682df909c5be7886a7ee5c4a6
Fixes: bug #1154808