Add a few more sanity checks in onDataIn parsing - Fixes issue #34