more null checks for statementcontroller
Merged 'develop'.
actually use the new ANTLR based parser in the real code