From bdc18cccf0b2102460226bcea65de464e0e6095e Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 8 Dec 2020 10:23:37 -0500
Subject: [PATCH] avoid NPE, fix test

---
 .../main/java/bubble/resources/bill/AccountPlansResource.java | 2 +-
 .../src/test/resources/models/tests/auth/network_auth.json    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java b/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
index 45d44fd2..58b60258 100644
--- a/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
+++ b/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
@@ -162,7 +162,7 @@ public class AccountPlansResource extends AccountOwnedResource<AccountPlan, Acco
             if (existingNetwork != null) errors.addViolation("err.name.networkNameAlreadyExists");
         }
 
-        if (request.getLaunchType().fork()) {
+        if (request.hasLaunchType() && request.getLaunchType().fork()) {
             if (!configuration.isSageLauncher()) {
                 errors.addViolation("err.forkHost.notAllowed");
             } else {
diff --git a/bubble-server/src/test/resources/models/tests/auth/network_auth.json b/bubble-server/src/test/resources/models/tests/auth/network_auth.json
index 254c2b70..51d4faa9 100644
--- a/bubble-server/src/test/resources/models/tests/auth/network_auth.json
+++ b/bubble-server/src/test/resources/models/tests/auth/network_auth.json
@@ -5,8 +5,8 @@
     "params": {
       "username": "root@local.local",
       "userSession": "rootSession",
-      "contactInfo": "root@example.com",
-      "contactLookup": "root@example.com"
+      "contactInfo": "root@local.local",
+      "contactLookup": "root@local.local"
     }
   },