diff --git a/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
index 7ecaf38..f319b26 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/DeviceKeyWebResourceTest.java
@@ -34,6 +34,7 @@
 import org.onosproject.net.key.DeviceKeyService;
 
 import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
@@ -393,6 +394,8 @@
             fail("POST of null device key did not throw an exception");
         } catch (BadRequestException ex) {
             assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+        } catch (InternalServerErrorException ex) {
+            assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
         }
 
         verify(mockDeviceKeyAdminService);
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
index 781cfae..b5e5829 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/TenantWebResourceTest.java
@@ -34,6 +34,7 @@
 import org.onosproject.incubator.net.virtual.VirtualNetworkAdminService;
 
 import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
@@ -276,6 +277,8 @@
             fail("POST of null tenant id did not throw an exception");
         } catch (BadRequestException ex) {
             assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+        } catch (InternalServerErrorException ex) {
+            assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
         }
 
         verify(mockVnetAdminService);
diff --git a/web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java
index 2ab185c..808c3d1 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/VirtualNetworkWebResourceTest.java
@@ -60,6 +60,7 @@
 import org.onosproject.net.PortNumber;
 
 import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
@@ -490,6 +491,8 @@
             fail("POST of null virtual network did not throw an exception");
         } catch (BadRequestException ex) {
             assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+        } catch (InternalServerErrorException ex) {
+            assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
         }
 
         verify(mockVnetAdminService);
@@ -663,6 +666,8 @@
             fail("POST of null virtual device did not throw an exception");
         } catch (BadRequestException ex) {
             assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+        } catch (InternalServerErrorException ex) {
+            assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
         }
 
         verify(mockVnetAdminService);
@@ -827,6 +832,8 @@
             fail("POST of null virtual port did not throw an exception");
         } catch (BadRequestException ex) {
             assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+        } catch (InternalServerErrorException ex) {
+            assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
         }
 
         verify(mockVnetAdminService);
@@ -1034,6 +1041,8 @@
             fail("POST of null virtual link did not throw an exception");
         } catch (BadRequestException ex) {
             assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+        } catch (InternalServerErrorException ex) {
+            assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
         }
 
         verify(mockVnetAdminService);
@@ -1237,6 +1246,8 @@
             fail("POST of null virtual host did not throw an exception");
         } catch (BadRequestException ex) {
             assertThat(ex.getMessage(), containsString("HTTP 400 Bad Request"));
+        } catch (InternalServerErrorException ex) {
+            assertThat(ex.getMessage(), containsString("HTTP 500 Internal Server Error"));
         }
 
         verify(mockVnetAdminService);