Fix null instruments

Fix #1132 
Fix #1130