Catching exception from getInstrument(). Re #6969.
Merge branch 'bugfix/6969_instrument_view_exception' into develop