Merge "Add null check for lifecycle"