Merge "fix monkey NPE"