Fixed parser regression
Consolidated more error checking code
Merge branch 'experimental/basia' of github.com:chung-leong/qb into experimental/basia
More work in progress