added extra info to error message for #999
Merge branch 'bugfixes/tokumx-1.4'