Merge "fix null pointer exception"