Don't crash when invalid expression
Ensures that it can handle variables
Merge branch 'hotfix/0.2.1'