Merge "Adding nullptr check for some framework components" into main