Fixed failure on unwinding due to current object not set
Merge pull request #47 from bvssvni/master

Fixed failure on unwinding due to current object not set