data prepare shouldnt catch exception
Merge pull request #29 from NurAlam/master

data prepare shouldnt catch exception