Extra null check on long-press