Make instrument status computation more robust
Merge pull request #1545 from mmeisinger/fix1396_state3_r2

OOIION-1396: Make instrument status computation more robust