diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
index 9d27aee4ded2..ea039e993bd2 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
@@ -31,7 +31,9 @@
 #include <errno.h>
 #include <unistd.h>
 #include <assert.h>
+#if defined(sun)
 #include <alloca.h>
+#endif
 
 #include <dt_impl.h>
 #include <dt_program.h>
@@ -247,7 +249,7 @@ dt_handle_liberr(dtrace_hdl_t *dtp, const dtrace_probedata_t *data,
 	err.dteda_action = -1;
 	err.dteda_offset = -1;
 	err.dteda_fault = DTRACEFLT_LIBRARY;
-	err.dteda_addr = NULL;
+	err.dteda_addr = 0;
 
 	len = strlen(faultstr) +
 	    strlen(errpd->dtpd_provider) + strlen(errpd->dtpd_mod) +