diff --git a/dns64/dns64.c b/dns64/dns64.c
index 77e689000..f2834da2b 100644
--- a/dns64/dns64.c
+++ b/dns64/dns64.c
@@ -628,6 +628,7 @@ handle_event_moddone(struct module_qstate* qstate, int id)
 
 	/* Store the response in cache. */
 	if ( (!iq || !iq->started_no_cache_store) &&
+		qstate->return_msg && qstate->return_msg->rep &&
 		!dns_cache_store(qstate->env, &qstate->qinfo, qstate->return_msg->rep,
 		0, 0, 0, NULL, qstate->query_flags))
 		log_err("out of memory");
diff --git a/doc/Changelog b/doc/Changelog
index c4f755eb2..9e05a0768 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+12 December 2018: Wouter
+	- Fix for crash in dns64 module if response is null.
+
 10 December 2018: Wouter
 	- Fix config parser memory leaks.
 	- ip-ratelimit-factor of 1 allows all traffic through, instead of the