Merge "Fix monkey NullPointerException"