diff --git a/cal_tools/cal_tools/tools.py b/cal_tools/cal_tools/tools.py
index b2ad615d41715c6ecb03d8ac6a96427773553989..34f8e211dcf6340e9b94a9fbb07508840d5ec234 100644
--- a/cal_tools/cal_tools/tools.py
+++ b/cal_tools/cal_tools/tools.py
@@ -412,6 +412,9 @@ def get_constant_from_db_and_time(device, constant, condition, empty_constant,
                           cal_db_interface, creation_time,
                           int(print_once), timeout, ntries)
     if m:
-        return data, m.calibration_constant_version.begin_at
+        if m.comm_db_success:
+            return data, m.calibration_constant_version.begin_at
+        else:
+            return data, None
     else:
         return data, None
diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 7b4e19887238c34550361834302a8bcbee0a9996..3d34b7934b7a7b73899a8fe4ed869dbbdfbfbdf3 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -640,10 +640,7 @@
     "    else:\n",
     "        for key, item in when.items():\n",
     "            if hasattr(item, 'strftime'):\n",
-    "                if item == creation_time:\n",
-    "                    item =  \"Constant was not retrieved\"\n",
-    "                else:\n",
-    "                    item = item.strftime('%y-%m-%d %H:%M')\n",
+    "                item = item.strftime('%y-%m-%d %H:%M')\n",
     "            # If constant retrieval is crashed\n",
     "            else:\n",
     "                item = 'None'\n",