diff --git a/devsupApp/src/setup.c b/devsupApp/src/setup.c
index 165bb77..ee92511 100644
--- a/devsupApp/src/setup.c
+++ b/devsupApp/src/setup.c
@@ -225,7 +225,7 @@ static void cleanupPy(void *junk)
     pyField_cleanup();
 
     /* release extra reference for hooktable */
-    Py_DECREF(hooktable);
+    Py_XDECREF(hooktable);
     hooktable = NULL;
 
     Py_Finalize();
diff --git a/python/devsup/hooks.py b/python/devsup/hooks.py
index 0cf3a5d..e2c800c 100644
--- a/python/devsup/hooks.py
+++ b/python/devsup/hooks.py
@@ -3,7 +3,7 @@ from __future__ import print_function
 try:
     import _dbapi
 except ImportError:
-    import _nullapi as _dbapi
+    import devsup._nullapi as _dbapi
 
 __all__ = [
     "hooknames",