diff --git a/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserFactory.java b/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserFactory.java
index b9ad047..a55537e 100644
--- a/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserFactory.java
+++ b/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserFactory.java
@@ -5,7 +5,7 @@
 public class BrowserFactory {
 
     public IBrowser createBrowser() {
-        return switch (BrowserName.fromString(WebPortalConstants.BROWSER)) {
+        return switch (BrowserName.fromConfigValue(WebPortalConstants.BROWSER)) {
             case FIREFOX -> new FirefoxBrowser();
             case WEBKIT -> new WebkitBrowser();
             case MS_EDGE -> new MsEdgeBrowser();
diff --git a/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserManager.java b/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserManager.java
index b676e5a..db59f2b 100644
--- a/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserManager.java
+++ b/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserManager.java
@@ -11,6 +11,7 @@ public class BrowserManager implements IBrowserManager<Page> {
 
     @Override
     public Page getBrowserPage(Playwright playwright) {
+        Objects.requireNonNull(playwright, "Playwright instance is null in Browser Manager!");
         boolean isHeadless = "headless".equals(WebPortalConstants.RUN_MODE);
         BrowserContext browserContext = new BrowserFactory().createBrowser().createSession(playwright, isHeadless);
         Objects.requireNonNull(browserContext, "Playwright Browser Context is null!");
diff --git a/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserName.java b/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserName.java
index d8fbc9b..6f3e02c 100644
--- a/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserName.java
+++ b/src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserName.java
@@ -5,6 +5,7 @@
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 @Getter
 @AllArgsConstructor
@@ -17,7 +18,8 @@ public enum BrowserName {
 
     private final String browserType;
 
-    public static BrowserName fromString(String browserName) {
+    public static BrowserName fromConfigValue(String browserName) {
+        Objects.requireNonNull(browserName, "Browser name cannot be null");
         return Arrays.stream(BrowserName.values())
                 .filter(browserType -> browserType.getBrowserType().equalsIgnoreCase(browserName))
                 .findFirst().orElseThrow(() -> new WebUtilsException("Unknown browser: " + browserName));