fix issue where server can crash while recovering from an instruments failure

(fix #3480) and add tests!