Handle water_level == None