Fix NPE by adding missing line to calculator.
Add comment
Merge pull request #125 from petergoldstein/feature/fix_npe_in_calculator

Fix NPE in calculator