fix: handle non loaded surprises in case they're returned as null from server Approved-by: Chuma Mcphoy (We Ahead)