Merge "Adding null check for invalid activity" into nyc-dev