Merge "Fix null pointer exception crashes caused by a mutable variable."