Fixes lost exception when UCEH and UCEH for test are both null

Patch 5416 suppose to report exceptions when UCEH is null however it was only working
when UCEH is null and UCEH for test was set.
I guess I never tested it after initial pass :/

Change-Id: I79f9bdcb8d65fe801b5f1043a837d33d6fc288a0
Merge remote-tracking branch 'upstream/master'