Catching exception from getInstrument(). Re #6969.
Merge remote-tracking branch 'origin/bugfix/6969_instrument_view_exception'