am 52eafbb7: Merge "fix monkey NPE" into jb-dev

* commit '52eafbb7601eac6ce0011edeb2a73ffccb6fb751':
  fix monkey NPE