diff --git a/Orchestrator/Workflows/Generate Unique Hostname/schema.png b/Orchestrator/Workflows/Generate Unique Hostname/schema.png
index 0855288..79b1365 100644
Binary files a/Orchestrator/Workflows/Generate Unique Hostname/schema.png and b/Orchestrator/Workflows/Generate Unique Hostname/schema.png differ
diff --git a/Orchestrator/Workflows/Generate Unique Hostname/x01_exception_handler.js b/Orchestrator/Workflows/Generate Unique Hostname/x01_exception_handler.js
new file mode 100644
index 0000000..2e9aa71
--- /dev/null
+++ b/Orchestrator/Workflows/Generate Unique Hostname/x01_exception_handler.js	
@@ -0,0 +1,8 @@
+/*  JavaScript: exception handler
+    Log the exception and release the lock.
+    Inputs: none
+    Outputs: none
+*/
+System.error("Workflow execution failed!");
+System.debug("Releasing lock...");
+LockingSystem.unlock("namingLock", "eventBroker");
\ No newline at end of file
diff --git a/Orchestrator/Workflows/Generate Unique Hostname/z01_errors.js b/Orchestrator/Workflows/Generate Unique Hostname/z01_errors.js
deleted file mode 100644
index 3b75209..0000000
--- a/Orchestrator/Workflows/Generate Unique Hostname/z01_errors.js	
+++ /dev/null
@@ -1,6 +0,0 @@
-/*  JavaScript: errors
-    Terminate the workflow in the event of an unrecoverable error
-    Inputs: errMsg (string)
-    Outputs: none
-*/
-System.error("FATAL ERROR!");
\ No newline at end of file
diff --git a/Orchestrator/Workflows/Generate Unique Hostname/z02_remove_lock.js b/Orchestrator/Workflows/Generate Unique Hostname/z02_remove_lock.js
deleted file mode 100644
index 1af4b6b..0000000
--- a/Orchestrator/Workflows/Generate Unique Hostname/z02_remove_lock.js	
+++ /dev/null
@@ -1,7 +0,0 @@
-/*  JavaScript: remove lock
-    Removes the lock to re-allow subsequent workflow runs
-    Inputs: none
-    Outputs: none
-*/
-System.debug("Releasing lock...");
-LockingSystem.unlock("namingLock","eventBroker");
\ No newline at end of file