diff --git a/makefile b/makefile
index f8b50a5..f873d2d 100644
--- a/makefile
+++ b/makefile
@@ -11,7 +11,7 @@ GDC := gdc
 LDC := ldc2
 
 githash:
-	git log -n 1 --oneline | cut -f 1 -d ' ' > githash.txt
+	git log -1 --format="%H" > githash.txt
 
 report:
 	dscanner --report src > dscanner-report.json
@@ -133,7 +133,6 @@ debugserver: githash
 	rm -f containers/src/std/allocator.d
 	${DMD} ${SERVER_SRC} ${DEBUG_SERVER_FLAGS}
 
-
 gdcclient: githash
 	mkdir -p bin
 	rm -f containers/src/std/allocator.d
diff --git a/src/conversion/first.d b/src/conversion/first.d
index 4560b30..4ba031e 100644
--- a/src/conversion/first.d
+++ b/src/conversion/first.d
@@ -174,8 +174,9 @@ final class FirstPass : ASTVisitor
 	override void visit(const BaseClass bc)
 	{
 //		Log.trace(__FUNCTION__, " ", typeof(bc).stringof);
-		currentSymbol.baseClasses.insert(iotcToStringArray(symbolAllocator,
-			bc.identifierOrTemplateChain));
+		if (bc.type2.identifierOrTemplateChain !is null)
+			currentSymbol.baseClasses.insert(iotcToStringArray(symbolAllocator,
+				bc.type2.identifierOrTemplateChain));
 	}
 
 	override void visit(const VariableDeclaration dec)