0.6.x: Report better errors when NPEs occur in CEQR
revert bad behaviour
Merge pull request #896 from metamx/six-fix

Six fix