fixed error codes #941
Merge branch 'bugfixes/tokumx-1.4'