Guard against shape_being_drawn set to None during drawing