2810 FIxes on state and null checking
Merge details
Closed TMS-2810
merged
mentioned in commit 2d9f59df