Merge "Handle null pointer exception"