Merge "Add null-checks to an optional dream service" into main