Merge "Fix null pointer exception"