handler: Add whip to handler