diff --git a/src/Interface.wl b/src/Interface.wl
index 0d178a6..9ebbae2 100644
--- a/src/Interface.wl
+++ b/src/Interface.wl
@@ -213,7 +213,7 @@ Options[PrintInitializations] :=
   {ChartName -> GetDefaultChart[], Mode -> "Temp", TensorType -> "Scal", StorageType -> "GF", DerivsOrder -> 1, AccuracyOrder -> 4};
 
 PrintInitializations[OptionsPattern[], varlist_?ListQ] :=
-  Module[{chartname, mode},
+  Module[{chartname, mode, tensortype, storagetype, derivsorder, accuracyorder},
     {chartname, mode, tensortype, storagetype, derivsorder, accuracyorder} = OptionValue[{ChartName, Mode, TensorType, StorageType, DerivsOrder, AccuracyOrder}];
     SetParseMode[{PrintComp -> True, SetComp -> False}];
     SetParsePrintCompMode[{Initializations -> True, Equations -> False}];
diff --git a/src/stencils/FiniteDifferenceStencils.wl b/src/stencils/FiniteDifferenceStencils.wl
index d35ff90..195857a 100644
--- a/src/stencils/FiniteDifferenceStencils.wl
+++ b/src/stencils/FiniteDifferenceStencils.wl
@@ -51,7 +51,8 @@ GetFiniteDifferenceCoefficients[sample_?ListQ, order_?IntegerQ] := Module[{numPo
 
   (* Ensure the sample has enough points for the desired order *)
   If[numPoints < order + 1,
-    Return[Message[GetFiniteDifferenceCoefficients::shortSample]];
+    Message[GetFiniteDifferenceCoefficients::shortSample];
+    Return[$Failed];
   ];
 
   (* Generate values array for finite difference coefficients *)
diff --git a/test/unit/FiniteDifferenceStencilsTests.wl b/test/unit/FiniteDifferenceStencilsTests.wl
index f581e3a..3af2b1f 100644
--- a/test/unit/FiniteDifferenceStencilsTests.wl
+++ b/test/unit/FiniteDifferenceStencilsTests.wl
@@ -109,7 +109,7 @@ AppendTo[$AllTests,
 AppendTo[$AllTests,
   VerificationTest[
     GetFiniteDifferenceCoefficients[{0, 1}, 2],
-    Null,
+    $Failed,
     {GetFiniteDifferenceCoefficients::shortSample},
     TestID -> "GetFiniteDifferenceCoefficients-InsufficientPoints"
   ]