CLC-3921 More test coverage and exception handling for exporter