Added check before DCalculator
-fixes #6