diff --git a/AssemblyData/Properties/AssemblyInfo.cs b/AssemblyData/Properties/AssemblyInfo.cs
index 6e560796..b61bb22e 100644
--- a/AssemblyData/Properties/AssemblyInfo.cs
+++ b/AssemblyData/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/AssemblyServer-x64/Properties/AssemblyInfo.cs b/AssemblyServer-x64/Properties/AssemblyInfo.cs
index 6f4da632..28bb27f0 100644
--- a/AssemblyServer-x64/Properties/AssemblyInfo.cs
+++ b/AssemblyServer-x64/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/AssemblyServer-x86/Properties/AssemblyInfo.cs b/AssemblyServer-x86/Properties/AssemblyInfo.cs
index 0f7f0ef6..121d9aa9 100644
--- a/AssemblyServer-x86/Properties/AssemblyInfo.cs
+++ b/AssemblyServer-x86/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/AssemblyServer/Properties/AssemblyInfo.cs b/AssemblyServer/Properties/AssemblyInfo.cs
index 6d29c2b7..56bc0a6d 100644
--- a/AssemblyServer/Properties/AssemblyInfo.cs
+++ b/AssemblyServer/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/Test.Rename.Dll/Properties/AssemblyInfo.cs b/Test.Rename.Dll/Properties/AssemblyInfo.cs
index 67724510..fad8bc4b 100644
--- a/Test.Rename.Dll/Properties/AssemblyInfo.cs
+++ b/Test.Rename.Dll/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/Test.Rename/Properties/AssemblyInfo.cs b/Test.Rename/Properties/AssemblyInfo.cs
index e4f80f60..8b2bdcbc 100644
--- a/Test.Rename/Properties/AssemblyInfo.cs
+++ b/Test.Rename/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/blocks/BlocksSorter.cs b/blocks/BlocksSorter.cs
index 441d98ab..9566810b 100644
--- a/blocks/BlocksSorter.cs
+++ b/blocks/BlocksSorter.cs
@@ -41,7 +41,8 @@ namespace de4dot.blocks {
 			visited = new Dictionary<BaseBlock, bool>();
 			sorted = new List<BaseBlock>(scopeBlock.BaseBlocks.Count);
 
-			search(scopeBlock.BaseBlocks[0]);
+			if (scopeBlock.BaseBlocks.Count > 0)
+				search(scopeBlock.BaseBlocks[0]);
 			sorted.Reverse();	// It's in reverse order
 
 			// Just in case there's dead code or unreferenced exception blocks
diff --git a/blocks/Properties/AssemblyInfo.cs b/blocks/Properties/AssemblyInfo.cs
index 8a31fdce..fa5461d9 100644
--- a/blocks/Properties/AssemblyInfo.cs
+++ b/blocks/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/de4dot-x64/Properties/AssemblyInfo.cs b/de4dot-x64/Properties/AssemblyInfo.cs
index 0dcebaa5..8a810a1c 100644
--- a/de4dot-x64/Properties/AssemblyInfo.cs
+++ b/de4dot-x64/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/de4dot-x86/Properties/AssemblyInfo.cs b/de4dot-x86/Properties/AssemblyInfo.cs
index 7238f58c..8ee0ab86 100644
--- a/de4dot-x86/Properties/AssemblyInfo.cs
+++ b/de4dot-x86/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/de4dot.code/ObfuscatedFile.cs b/de4dot.code/ObfuscatedFile.cs
index 30adf84b..f1c24595 100644
--- a/de4dot.code/ObfuscatedFile.cs
+++ b/de4dot.code/ObfuscatedFile.cs
@@ -414,7 +414,7 @@ namespace de4dot {
 				Log.v("Deobfuscating {0} ({1:X8})", method, method.MetadataToken.ToUInt32());
 				Log.indent();
 
-				if (method.HasBody) {
+				if (hasNonEmptyBody(method)) {
 					var blocks = new Blocks(method);
 
 					deob.deobfuscateMethodBegin(blocks);
@@ -440,6 +440,10 @@ namespace de4dot {
 			}
 		}
 
+		bool hasNonEmptyBody(MethodDefinition method) {
+			return method.HasBody && method.Body.Instructions.Count > 0;
+		}
+
 		void deobfuscateStrings(Blocks blocks) {
 			switch (options.StringDecrypterType) {
 			case DecrypterType.None:
@@ -488,7 +492,7 @@ namespace de4dot {
 			Log.v("{0}: {1} ({2:X8})", msg, method, method.MetadataToken.ToUInt32());
 			Log.indent();
 
-			if (method.HasBody) {
+			if (hasNonEmptyBody(method)) {
 				var blocks = new Blocks(method);
 
 				handler(blocks);
diff --git a/de4dot.code/Properties/AssemblyInfo.cs b/de4dot.code/Properties/AssemblyInfo.cs
index f38efd47..89c4715f 100644
--- a/de4dot.code/Properties/AssemblyInfo.cs
+++ b/de4dot.code/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/de4dot/Properties/AssemblyInfo.cs b/de4dot/Properties/AssemblyInfo.cs
index 3ca1118f..e00a56ca 100644
--- a/de4dot/Properties/AssemblyInfo.cs
+++ b/de4dot/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]
diff --git a/dumpMethods/Properties/AssemblyInfo.cs b/dumpMethods/Properties/AssemblyInfo.cs
index 6f67fedf..4d317e82 100644
--- a/dumpMethods/Properties/AssemblyInfo.cs
+++ b/dumpMethods/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.0.0.3405")]
-[assembly: AssemblyFileVersion("1.0.0.3405")]
+[assembly: AssemblyVersion("1.0.1.3405")]
+[assembly: AssemblyFileVersion("1.0.1.3405")]