diff --git a/app/app.js b/app/app.js
index f99b123..6b944d2 100644
--- a/app/app.js
+++ b/app/app.js
@@ -8,9 +8,11 @@ const modelerEl = document.getElementById('modeler');
 const panelEl = document.getElementById('panel');
 const spiffModdleExtension = require('./spiffworkflow/moddle/spiffworkflow.json');
 
+let bpmnModeler;
+
 // create modeler
 try {
-  const bpmnModeler = new BpmnModeler({
+  bpmnModeler = new BpmnModeler({
     container: modelerEl,
     propertiesPanel: {
       parent: panelEl
@@ -24,18 +26,19 @@ try {
       spiffworkflowModdle: spiffModdleExtension
     }
   });
-
-  // import XML
-  bpmnModeler.importXML(diagramXML).then(() => {});
-
 } catch (error) {
   if (error.constructor.name === 'AggregateError') {
     console.log(error.message);
     console.log(error.name);
     console.log(error.errors);
   }
+  throw error;
 }
 
+// import XML
+bpmnModeler.importXML(diagramXML).then(() => {});
+
+
 
 /** ****************************************
  * Below are a few helper methods so we can upload and download files
diff --git a/app/spiffworkflow/messages/index.js b/app/spiffworkflow/messages/index.js
new file mode 100644
index 0000000..6fd89f8
--- /dev/null
+++ b/app/spiffworkflow/messages/index.js
@@ -0,0 +1,6 @@
+import MessagesPropertiesProvider from './propertiesPanel/MessagesPropertiesProvider';
+
+export default {
+  __init__: [ 'messagesPropertiesProvider' ],
+  messagesPropertiesProvider: [ 'type', MessagesPropertiesProvider ],
+};
diff --git a/test/spec/MessagesSpec.js b/test/spec/MessagesSpec.js
new file mode 100644
index 0000000..fd1abcc
--- /dev/null
+++ b/test/spec/MessagesSpec.js
@@ -0,0 +1,36 @@
+import TestContainer from 'mocha-test-container-support';
+import { bootstrapPropertiesPanel, findEntry } from './helpers';
+import { BpmnPropertiesPanelModule, BpmnPropertiesProviderModule } from 'bpmn-js-properties-panel';
+import spiffModdleExtension from '../../app/spiffworkflow/moddle/spiffworkflow.json';
+import messages from '../../app/spiffworkflow/messages';
+
+
+describe('Messages should work', function() {
+  let xml = require('./bpmn/collaboration.bpmn').default;
+  let container;
+
+  beforeEach(function() {
+    container = TestContainer.get(this);
+  });
+
+  beforeEach(bootstrapPropertiesPanel(xml, {
+    container,
+    debounceInput: false,
+    additionalModules: [
+      messages,
+      BpmnPropertiesPanelModule,
+      BpmnPropertiesProviderModule,
+    ],
+    moddleExtensions: {
+      spiffworkflow: spiffModdleExtension
+    },
+  }));
+
+  it('should allow you to see the collaborations section', async function() {
+
+    // THEN - a select Data Object section should appear in the properties panel
+    let entry = findEntry('edit_message_correlations', container);
+    expect(entry).to.exist;
+  });
+
+});