diff --git a/ICSharpCode.Decompiler/DecompilerSettings.cs b/ICSharpCode.Decompiler/DecompilerSettings.cs
index 6d6e16d21..9e29709ef 100644
--- a/ICSharpCode.Decompiler/DecompilerSettings.cs
+++ b/ICSharpCode.Decompiler/DecompilerSettings.cs
@@ -375,6 +375,34 @@ namespace ICSharpCode.Decompiler
 
 		#endregion
 
+		#region Assembly Load and Resolve options
+
+		bool loadInMemory = false;
+
+		public bool LoadInMemory {
+			get { return loadInMemory; }
+			set {
+				if (loadInMemory != value) {
+					loadInMemory = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
+		bool throwOnAssemblyResolveErrors = false;
+
+		public bool ThrowOnAssemblyResolveErrors {
+			get { return throwOnAssemblyResolveErrors; }
+			set {
+				if (throwOnAssemblyResolveErrors != value) {
+					throwOnAssemblyResolveErrors = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
+		#endregion
+
 		CSharpFormattingOptions csharpFormattingOptions;
 		
 		public CSharpFormattingOptions CSharpFormattingOptions {