Possible fix for eval server-crashing
Merge pull request #38 from cbankester/evalFix

Possible fix for eval server-crashing