Fixed an issue where $currentTrigger was being referenced and wasn't checked for null values