Add nil check to marked_by?