Make sure that the state is non-Null
before comparing it.

Signed-off-by: Poornima Gupte <poornima.gupte@in.ibm.com>
Merge branch 'tp/S1052230' into ibm_next_tmp
Merge branch 'tp/ibm_next_pg_S1048601' into ibm_next_tmp