diff --git a/extension/src/main/java/synfron/reshaper/burp/core/messages/ContentType.java b/extension/src/main/java/synfron/reshaper/burp/core/messages/ContentType.java
index 83d5590..fb87e4f 100644
--- a/extension/src/main/java/synfron/reshaper/burp/core/messages/ContentType.java
+++ b/extension/src/main/java/synfron/reshaper/burp/core/messages/ContentType.java
@@ -54,6 +54,9 @@ public String getName() {
     }
 
     public static ContentType get(burp.api.montoya.http.message.ContentType contentType) {
+        if (contentType == null) {
+            return Unknown;
+        }
         return switch (contentType) {
             case AMF -> Amf;
             case XML -> Xml;
diff --git a/extension/src/main/java/synfron/reshaper/burp/core/messages/entities/http/HttpRequestMessage.java b/extension/src/main/java/synfron/reshaper/burp/core/messages/entities/http/HttpRequestMessage.java
index 7a9d7ba..9b322ea 100644
--- a/extension/src/main/java/synfron/reshaper/burp/core/messages/entities/http/HttpRequestMessage.java
+++ b/extension/src/main/java/synfron/reshaper/burp/core/messages/entities/http/HttpRequestMessage.java
@@ -50,6 +50,7 @@ public boolean isChanged() {
 
     private void initialize() {
         if (!initialized) {
+            initialized = true;
             if (httpRequest == null) {
                 sanityCheckHeaders();
                 httpRequest = HttpRequest.httpRequest(ByteArray.byteArray(request));
@@ -57,7 +58,6 @@ private void initialize() {
             if (!encoder.isUseDefault() && encoder.isAutoSet() && !getContentType().isTextBased()) {
                 encoder.setEncoding("default", true);
             }
-            initialized = true;
         }
     }