FIXUP: make error messages more meaningful