Moved handler finish to within the stack.