Less destructive way of handling null $currentTrigger