diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c9e35f..5564448 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [1.3.3] - 2024-07-30
+
+### Fixed
+
+* Fix Null Pointer Exception on startup
+
+
 ## [1.3.2] - 2024-07-16
 
 ### Added
diff --git a/pom.xml b/pom.xml
index ed56f26..318a6ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.usd.CSTC</groupId>
 	<artifactId>CSTC</artifactId>
-	<version>1.3.2</version>
+	<version>1.3.3</version>
 	<name>CSTC</name>
 	<description>CSTC</description>
 	
diff --git a/src/main/java/burp/MyExtensionProvidedHttpRequestEditor.java b/src/main/java/burp/MyExtensionProvidedHttpRequestEditor.java
index 76ba9de..f299c4a 100644
--- a/src/main/java/burp/MyExtensionProvidedHttpRequestEditor.java
+++ b/src/main/java/burp/MyExtensionProvidedHttpRequestEditor.java
@@ -25,16 +25,9 @@ public class MyExtensionProvidedHttpRequestEditor implements ExtensionProvidedHt
 
     MyExtensionProvidedHttpRequestEditor(EditorCreationContext creationContext, View view)
     {
-        if(creationContext.toolSource().isFromTool(ToolType.REPEATER)) {
-            this.api = BurpUtils.getInstance().getApi();
-            this.view = view;
-            requestEditor = api.userInterface().createRawEditor(EditorOptions.READ_ONLY);
-        }
-        else {
-            this.api = null;
-            this.view = null;
-            this.requestEditor = null;
-        }
+        this.api = BurpUtils.getInstance().getApi();
+        this.view = view;
+        requestEditor = api.userInterface().createRawEditor(EditorOptions.READ_ONLY);
     }
 
     @Override
diff --git a/src/main/java/burp/MyHttpRequestEditorProvider.java b/src/main/java/burp/MyHttpRequestEditorProvider.java
index 94b3253..ecb3fc0 100644
--- a/src/main/java/burp/MyHttpRequestEditorProvider.java
+++ b/src/main/java/burp/MyHttpRequestEditorProvider.java
@@ -1,6 +1,7 @@
 package burp;
 
 import burp.api.montoya.MontoyaApi;
+import burp.api.montoya.core.ToolType;
 import burp.api.montoya.ui.editor.extension.EditorCreationContext;
 import burp.api.montoya.ui.editor.extension.ExtensionProvidedHttpRequestEditor;
 import burp.api.montoya.ui.editor.extension.HttpRequestEditorProvider;
@@ -17,6 +18,11 @@ class MyHttpRequestEditorProvider implements HttpRequestEditorProvider
     @Override
     public ExtensionProvidedHttpRequestEditor provideHttpRequestEditor(EditorCreationContext creationContext)
     {
-        return new MyExtensionProvidedHttpRequestEditor(creationContext, view);
+        if(creationContext.toolSource().isFromTool(ToolType.REPEATER)) {
+            return new MyExtensionProvidedHttpRequestEditor(creationContext, view);
+        }
+        else {
+            return null;
+        }
     }
 }
\ No newline at end of file