Make instrumenter slightly more robust.