diff --git a/README.md b/README.md
index a8c0c607..834938a2 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ The core T-Engine images are available on Docker Hub.
 Either as a single Core AIO (All-In-One) T-Engine:
 * [alfresco/alfresco-transform-core-aio](https://hub.docker.com/r/alfresco/alfresco-transform-core-aio)
 
-Or as set of individual T-Engines:
+Or as a set of individual T-Engines:
 * [alfresco/alfresco-imagemagick](https://hub.docker.com/r/alfresco/alfresco-imagemagick)
 * [alfresco/alfresco-pdf-renderer](https://hub.docker.com/r/alfresco/alfresco-pdf-renderer)
 * [alfresco/alfresco-libreoffice](https://hub.docker.com/r/alfresco/alfresco-libreoffice)
diff --git a/docs/engine_config.md b/docs/engine_config.md
index a0bcf8cd..9d49ccde 100644
--- a/docs/engine_config.md
+++ b/docs/engine_config.md
@@ -116,7 +116,7 @@ The config can be found under `alfresco-transform-core/engines/<t-engine-name>/s
     priority** is.
    
 ## Transformer selection strategy
-The ACS repository will use the T-Engine configuration to choose which T-Engine will perform a transform.
+The T-Engine configuration is used to choose which T-Engine will perform a transform.
 A transformer definition contains a supported list of source and target Media Types. This is used for the
 most basic selection. This is further refined by checking that the definition also supports transform options
 (parameters) that have been supplied in a transform request or a Rendition Definition used in a rendition request.
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformRegistry.java b/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformRegistry.java
index 99f76ca3..268a71e0 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformRegistry.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformRegistry.java
@@ -298,7 +298,6 @@ public class TransformRegistry extends AbstractTransformRegistry
         try
         {
             return s.get();
-
         }
         finally
         {
@@ -336,7 +335,8 @@ public class TransformRegistry extends AbstractTransformRegistry
 
     private Transformer getTransformer(Data data, String transformerName)
     {
-        return data.getTransformerByNameMap().get(transformerName).get();
+        Origin<Transformer> transformerOrigin = data.getTransformerByNameMap().get(transformerName);
+        return transformerOrigin == null ? null : transformerOrigin.get();
     }
 
     public boolean checkSourceSize(String transformerName, String sourceMediaType, Long sourceSize, String targetMediaType)