moved parameter checking before to the token firing
Merge branch 'master' of https://github.com/istvanrath/EMF-IncQuery-Addons