Moved the error trap to the right location
Merge branch 'RELEASE-0.9.6'