coverity#1240261 Logically dead code

we must check the new proposed state for sanity, not the
old state

Change-Id: Iabab0ccda4942ec82b243ad07762187be916d43f
coverity#1240266 Logically dead code

Change-Id: I97256c687c6d56beef2c3664bbba8c43f685228b