Index: libcfa/src/interpose.cfa
===================================================================
--- libcfa/src/interpose.cfa	(revision 9853d9b09f5b20cc2d6bea1b03a978a2ece5e9c3)
+++ libcfa/src/interpose.cfa	(revision 1469a8aabaefc9cc2ab5e6284f5782dfe30243f5)
@@ -10,6 +10,6 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Nov 30 07:09:42 2019
-// Update Count     : 119
+// Last Modified On : Fri Dec 13 13:45:21 2019
+// Update Count     : 121
 //
 
@@ -229,7 +229,11 @@
 
 void sigHandler_segv( __CFA_SIGPARMS__ ) {
-	abort( "Addressing invalid memory at location %p\n"
-			"Possible cause is reading outside the address space or writing to a protected area within the address space with an invalid pointer or subscript.\n",
-			sfp->si_addr );
+		if ( sfp->si_addr == NULL ) {
+			abort( "Null pointer (0p) dereference.\n" );
+		} else {
+			abort( "%s at memory location %p.\n"
+				   "Possible cause is reading outside the address space or writing to a protected area within the address space with an invalid pointer or subscript.\n",
+				   (sig == SIGSEGV ? "Segment fault" : "Bus error"), sfp->si_addr );
+		}
 }
 
Index: c/AST/TypeVar.hpp
===================================================================
--- src/AST/TypeVar.hpp	(revision 9853d9b09f5b20cc2d6bea1b03a978a2ece5e9c3)
+++ 	(revision )
@@ -1,34 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// TypeVar.hpp --
-//
-// Author           : Aaron B. Moss
-// Created On       : Wed May 15 15:00:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Wed May 15 15:00:00 2019
-// Update Count     : 1
-//
-
-#pragma once
-
-namespace ast {
-
-namespace TypeVar {
-
-/// type variable variants.
-/// `otype` is treated as a constrainted `dtype`
-enum Kind { Dtype, Ftype, Ttype, NUMBER_OF_KINDS };
-
-}
-
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
