diff --git a/core/api/src/main/java/org/onosproject/net/driver/DefaultDriverProviderService.java b/core/api/src/main/java/org/onosproject/net/driver/DefaultDriverProviderService.java
new file mode 100644
index 0000000..2b7eeff
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/driver/DefaultDriverProviderService.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.net.driver;
+
+/**
+ * Service capable of providing a set of default drivers.
+ */
+public interface DefaultDriverProviderService extends DriverProvider {
+}
diff --git a/core/api/src/main/java/org/onosproject/net/flowobjective/DefaultForwardingObjective.java b/core/api/src/main/java/org/onosproject/net/flowobjective/DefaultForwardingObjective.java
index 6489bea..9bbe991 100644
--- a/core/api/src/main/java/org/onosproject/net/flowobjective/DefaultForwardingObjective.java
+++ b/core/api/src/main/java/org/onosproject/net/flowobjective/DefaultForwardingObjective.java
@@ -36,7 +36,7 @@
     private final int timeout;
     private final ApplicationId appId;
     private final int priority;
-    private final int nextId;
+    private final Integer nextId;
     private final TrafficTreatment treatment;
     private final Operation op;
     private final Optional<ObjectiveContext> context;
@@ -46,7 +46,7 @@
     private DefaultForwardingObjective(TrafficSelector selector,
                                       Flag flag, boolean permanent,
                                       int timeout, ApplicationId appId,
-                                      int priority, int nextId,
+                                      int priority, Integer nextId,
                                       TrafficTreatment treatment, Operation op) {
         this.selector = selector;
         this.flag = flag;
@@ -67,7 +67,7 @@
     private DefaultForwardingObjective(TrafficSelector selector,
                                        Flag flag, boolean permanent,
                                        int timeout, ApplicationId appId,
-                                       int priority, int nextId,
+                                       int priority, Integer nextId,
                                        TrafficTreatment treatment,
                                        ObjectiveContext context, Operation op) {
         this.selector = selector;
diff --git a/core/api/src/main/java/org/onosproject/net/flowobjective/ObjectiveError.java b/core/api/src/main/java/org/onosproject/net/flowobjective/ObjectiveError.java
index 6e60ab6..192b206 100644
--- a/core/api/src/main/java/org/onosproject/net/flowobjective/ObjectiveError.java
+++ b/core/api/src/main/java/org/onosproject/net/flowobjective/ObjectiveError.java
@@ -41,6 +41,11 @@
     GROUPMISSING,
 
     /**
+     * The device was not available to install objectives to.
+     */
+    DEVICEMISSING,
+
+    /**
      * An unknown error occurred.
      */
     UNKNOWN