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..c81d5f5 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);
@@ -450,4 +453,4 @@
         verify(mockDeviceKeyService);
         verify(mockDeviceKeyAdminService);
     }
-}
\ No newline at end of file
+}