Merge "Prevent null point exception"