Merge "Fix null-pointer derefernce warning."