diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index 435b98205..44221b6ae 100644
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -1650,7 +1650,10 @@ METHOD(message_t, generate, status_t,
 		}
 	}
 	generator->destroy(generator);
-	*packet = this->packet->clone(this->packet);
+	if (packet)
+	{
+		*packet = this->packet->clone(this->packet);
+	}
 	return SUCCESS;
 }