diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba1bc4c1df660a77d2c3713a10e958274a4f79c0..211fcbb6cda7b1ad6a0baac3552e25338624ae26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@
 #
 ci_trigger:
    image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:trigger
-   script: ""
+   script: "true"
    tags:
         - tdaq
    variables:
@@ -17,7 +17,7 @@ ci_trigger:
 # You should not have to modify the following
 ci_build:
    image: $TDAQ_CI_IMAGE
-   script: ""
+   script: "true"
    tags:
         - tdaq
    only:
diff --git a/src/Session.cxx b/src/Session.cxx
index 77fef477bc283971862e24c327c1b4e28ecd3016..5c7073ff37a6a5111b9f9ca59b408d662543395e 100644
--- a/src/Session.cxx
+++ b/src/Session.cxx
@@ -226,10 +226,10 @@ void Session::asyncClose()
 void Session::checkClose()
 {
   if (m_state == State::CLOSE_PENDING && m_recvNPending == 0 && m_sendQueue.empty()) {
-    m_localName.clear();
-    m_remoteName.clear();
     m_state = State::CLOSED;
     onClose();
+    m_localName.clear();
+    m_remoteName.clear();
   }
 }