Refs #62 - Handle inconsistent data income