Merge "Fix NPE from monkey run"