diff --git a/src/index.test.ts b/src/index.test.ts
index 6aea261..d739668 100644
--- a/src/index.test.ts
+++ b/src/index.test.ts
@@ -6,6 +6,7 @@ import * as mockSiteModel from './test-helpers/mock-site-model.json';
 import * as mockDataset from './test-helpers/mock-dataset.json';
 import { readableFromArray } from './test-helpers/stream-utils';
 import { DcatApError } from './dcat-ap/dcat-ap-error';
+import { PassThrough } from 'stream';
 
 describe('Output Plugin', () => {
   let mockFetchSite;
@@ -30,6 +31,13 @@ describe('Output Plugin', () => {
     app.get('/dcat', function (req, res, next) {
       req.app.locals.feedTemplateTransforms = feedTemplateTransforms;
       res.locals.feedTemplate = feedTemplate;
+      
+      app.use((err, _req, res, _next) => {
+        res.status(err.status || 500)
+        res.send({
+          error: err.message
+        })
+      })
       next();
     }, plugin.serve.bind(plugin));
 
@@ -132,6 +140,25 @@ describe('Output Plugin', () => {
     // TODO test stream error
   });
 
+  it('returns error if stream emits an error', async () => {
+    const mockReadable = new PassThrough();
+
+    plugin.model.pullStream.mockResolvedValue(mockReadable);
+    const mockError = new Error('stream error')
+
+    setTimeout(() => {
+      mockReadable.emit('error', mockError)
+    }, 200)
+    await request(app)
+      .get('/dcat')
+      .set('host', siteHostName)
+      .expect('Content-Type', /application\/json/)
+      .expect(500)
+      .expect((res) => {
+        expect(res.body).toEqual({ error: 'stream error' });
+      });
+  });
+
   it('returns 400 when searchRequest returns 400', async () => {
     [plugin, app] = buildPluginAndApp({}, {});
 
diff --git a/src/index.ts b/src/index.ts
index 3f40cbe..0666b8a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -33,10 +33,12 @@ export = class OutputDcatAp201 {
       const { dcatStream } = getDataStreamDcatAp201(feedTemplate, feedTemplateTransformsDcatAp);
 
       const datasetStream = await this.getDatasetStream(req);
-
-      datasetStream
-        .pipe(dcatStream)
-        .pipe(res);
+      
+      datasetStream.on('error', (err) => {
+        if (req.next) {
+          req.next(err);
+        }
+      }).pipe(dcatStream).pipe(res);
 
     } catch (err) {
       res.status(err.statusCode).send(this.getErrorResponse(err));