diff --git a/vtkm/cont/ArrayContainerControl.h b/vtkm/cont/ArrayContainerControl.h
index 68c3fa127..fcd3e01d8 100644
--- a/vtkm/cont/ArrayContainerControl.h
+++ b/vtkm/cont/ArrayContainerControl.h
@@ -20,8 +20,8 @@
 #ifndef vtk_m_cont__ArrayContainerControl_h
 #define vtk_m_cont__ArrayContainerControl_h
 
-#define VTKM_ARRAY_CONTAINER_CONTROL_ERROR      -1
-#define VTKM_ARRAY_CONTAINER_CONTROL_UNDEFINED   0
+#define VTKM_ARRAY_CONTAINER_CONTROL_ERROR      -2
+#define VTKM_ARRAY_CONTAINER_CONTROL_UNDEFINED  -1
 #define VTKM_ARRAY_CONTAINER_CONTROL_BASIC       1
 
 #ifndef VTKM_ARRAY_CONTAINER_CONTROL
diff --git a/vtkm/cont/internal/DeviceAdapterTag.h b/vtkm/cont/internal/DeviceAdapterTag.h
index 1786cb76a..72f38f681 100644
--- a/vtkm/cont/internal/DeviceAdapterTag.h
+++ b/vtkm/cont/internal/DeviceAdapterTag.h
@@ -27,8 +27,8 @@
 
 #include <boost/static_assert.hpp>
 
-#define VTKM_DEVICE_ADAPTER_ERROR     -1
-#define VTKM_DEVICE_ADAPTER_UNDEFINED  0
+#define VTKM_DEVICE_ADAPTER_ERROR     -2
+#define VTKM_DEVICE_ADAPTER_UNDEFINED -1
 #define VTKM_DEVICE_ADAPTER_SERIAL     1
 
 #ifndef VTKM_DEVICE_ADAPTER