Wrap data elements to prevent abnormal exit
wrapped more variables
Merge pull request #163 from jblackburn22/master

Wrap data elements to prevent abnormal exit