Merge "Fix weakness causing NPE"