Fixed failure on unwinding due to current object not set