diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
index 6dbf271493..a2aafb3a20 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
@@ -332,7 +332,11 @@ void Foam::codedBase::updateLibrary
     {
         createLibrary(dynCode, context);
 
-        loadLibrary(libPath, dynCode.codeName(), context.dict());
+        if (!loadLibrary(libPath, dynCode.codeName(), context.dict()))
+        {
+            FatalIOErrorInFunction(context.dict())
+                << "Failed to load " << libPath << exit(FatalIOError);
+        }
     }
 
     // retain for future reference
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
index 42550e3e23..36d0a40b06 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
@@ -102,6 +102,23 @@ Foam::dynamicCodeContext::dynamicCodeContext
             );
         }
     }
+
+    // Options
+    const entry* optionsPtr = dict.lookupEntryPtr("codeOptions", false, false);
+    if (optionsPtr)
+    {
+        options_ =
+            stringOps::expand(stringOps::trim(optionsPtr->stream()), dict);
+    }
+
+    // Libs
+    const entry* libsPtr = dict.lookupEntryPtr("codeLibs", false, false);
+    if (libsPtr)
+    {
+        libs_ =
+            stringOps::expand(stringOps::trim(libsPtr->stream()), dict);
+    }
+
 }