diff --git a/tools/class-parse/Mono.Options-PCL.cs b/tools/class-parse/Mono.Options-PCL.cs
index 33c1588cf..32e71a265 100644
--- a/tools/class-parse/Mono.Options-PCL.cs
+++ b/tools/class-parse/Mono.Options-PCL.cs
@@ -530,7 +530,7 @@ protected static T Parse<T> (string value, OptionContext c)
 			bool nullable = ti.IsValueType && ti.IsGenericType &&
 			                !ti.IsGenericTypeDefinition &&
 			                tt.GetGenericTypeDefinition () == typeof(Nullable<>);
-			Type targetType = nullable ? tt.GetTypeInfo ().GenericTypeParameters [0] : typeof(T);
+			Type targetType = nullable ? tt.GetTypeInfo ().GenericTypeArguments [0] : typeof(T);
 			//TypeConverter conv = TypeDescriptor.GetConverter (targetType);
 			T t = default (T);
 			try {
diff --git a/tools/class-parse/Program.cs b/tools/class-parse/Program.cs
index 43264d308..b7c4f5ed9 100644
--- a/tools/class-parse/Program.cs
+++ b/tools/class-parse/Program.cs
@@ -139,7 +139,7 @@ static void DumpClassFile (string file, TextWriter output)
 				output.WriteLine ("\t{0}: {1}", i, c.ConstantPool [i]);
 			}
 			output.WriteLine ("ThisClass: {0}", c.ThisClass.Name);
-			output.WriteLine ("SuperClass: {0}", c.SuperClass.Name);
+			output.WriteLine ("SuperClass: {0}", c.SuperClass?.Name);
 			output.WriteLine ("AccessFlags: {0}", c.AccessFlags);
 			output.WriteLine ("Attributes Count: {0}", c.Attributes.Count);
 			for (int i = 0; i < c.Attributes.Count; ++i) {