diff --git a/DynamoDBGenerator.SourceGenerator.Tests/DynamoDBDocumentTests/Serialize/NullableAnnotationTests.cs b/DynamoDBGenerator.SourceGenerator.Tests/DynamoDBDocumentTests/Serialize/NullableAnnotationTests.cs
index a8d99fc9..6225190c 100644
--- a/DynamoDBGenerator.SourceGenerator.Tests/DynamoDBDocumentTests/Serialize/NullableAnnotationTests.cs
+++ b/DynamoDBGenerator.SourceGenerator.Tests/DynamoDBDocumentTests/Serialize/NullableAnnotationTests.cs
@@ -1,5 +1,6 @@
 using System;
 using DynamoDBGenerator.Attributes;
+using DynamoDBGenerator.Exceptions;
 namespace DynamoDBGenerator.SourceGenerator.Tests.DynamoDBDocumentTests.Serialize;
 
 [DynamoDBMarshaller(typeof(NullableAnnotationTests))]
diff --git a/DynamoDBGenerator.SourceGenerator/Constants.cs b/DynamoDBGenerator.SourceGenerator/Constants.cs
index a5e5c0d4..189ae74d 100644
--- a/DynamoDBGenerator.SourceGenerator/Constants.cs
+++ b/DynamoDBGenerator.SourceGenerator/Constants.cs
@@ -3,7 +3,7 @@
 
 namespace DynamoDBGenerator.SourceGenerator;
 
-public class Constants
+public static class Constants
 {
     public const string AssemblyName = nameof(DynamoDBGenerator);
     public const string AttributeNameSpace = nameof(Attributes);
@@ -11,6 +11,12 @@ public class Constants
     public const string MarshallerConstructorAttributeName = nameof(DynamoDBMarshallerConstructorAttribute);
     public const string DynamoDbDocumentPropertyFullname = $"{AssemblyName}.{AttributeNameSpace}.{MarshallerAttributeName}";
     
+    public static class Errors
+    {
+        
+        
+    }
+    
 
     public const string NewLine = @"
 ";
diff --git a/DynamoDBGenerator.SourceGenerator/Extensions/CodeGeneration/CodeGenerationExtensions.cs b/DynamoDBGenerator.SourceGenerator/Extensions/CodeGeneration/CodeGenerationExtensions.cs
index 461af8de..0d8e287a 100644
--- a/DynamoDBGenerator.SourceGenerator/Extensions/CodeGeneration/CodeGenerationExtensions.cs
+++ b/DynamoDBGenerator.SourceGenerator/Extensions/CodeGeneration/CodeGenerationExtensions.cs
@@ -22,6 +22,7 @@ public static string CreateNamespace(this ITypeSymbol type, in string content)
 using Amazon.DynamoDBv2.Model;
 using DynamoDBGenerator;
 using DynamoDBGenerator.Attributes;
+using DynamoDBGenerator.Exceptions;
 
 {(nameSpace is null ? null : $@"namespace {nameSpace}
 {{")}
diff --git a/DynamoDBGenerator/DynamoDBClient.cs b/DynamoDBGenerator/DynamoDBClient.cs
index ef48a057..596a5025 100644
--- a/DynamoDBGenerator/DynamoDBClient.cs
+++ b/DynamoDBGenerator/DynamoDBClient.cs
@@ -97,13 +97,4 @@ public async Task<T> UpdateReturned(TArg entity, Func<IDynamoDBKeyMarshaller, TA
 
         return _marshaller.Unmarshall(result.Attributes);
     }
-}
-
-public class DynamoDBMarshallingException : InvalidOperationException
-{
-    public string MemberName { get; }
-    public DynamoDBMarshallingException(string memberName, string message) : base(message: $"{message} (Data member '{memberName}')")
-    {
-        MemberName = memberName;
-    }
 }
\ No newline at end of file
diff --git a/DynamoDBGenerator/Exceptions/DynamoDBMarshallingException.cs b/DynamoDBGenerator/Exceptions/DynamoDBMarshallingException.cs
new file mode 100644
index 00000000..cc737c11
--- /dev/null
+++ b/DynamoDBGenerator/Exceptions/DynamoDBMarshallingException.cs
@@ -0,0 +1,11 @@
+using System;
+namespace DynamoDBGenerator.Exceptions;
+
+public class DynamoDBMarshallingException : InvalidOperationException
+{
+    public string MemberName { get; }
+    public DynamoDBMarshallingException(string memberName, string message) : base(message: $"{message} (Data member '{memberName}')")
+    {
+        MemberName = memberName;
+    }
+}
\ No newline at end of file