diff --git a/daemon/dnfdaemon-session.py b/daemon/dnfdaemon-session.py
index 3eb7c65e140e1a12b697caa77bb21421caba72cb..4b8db919711b15ce547b7317536a844476ce0727 100755
--- a/daemon/dnfdaemon-session.py
+++ b/daemon/dnfdaemon-session.py
@@ -95,7 +95,7 @@ class DnfDaemon(dnfdaemon.server.DnfDaemonBase):
                          sender_keyword='sender')
     def Lock(self, sender=None):
         '''
-        Get the yum lock
+        Get the dnfdaemon lock
         :param sender:
         '''
         if not self._lock:
@@ -367,13 +367,15 @@ class DnfDaemon(dnfdaemon.server.DnfDaemonBase):
 
     def check_lock(self, sender):
         '''
-        Check that the current sender is owning the yum lock
+        Check that the current sender is owning the dnfdaemon lock
         :param sender:
         '''
         if self._lock == sender:
             return True
+        elif self._lock:
+            raise LockedError('dnfdaemon is locked by another application')
         else:
-            raise LockedError('dnf is locked by another application')
+            raise LockedError('dnfdaemon is not locked, but was expected to be')
 
 
 def main():
diff --git a/daemon/dnfdaemon-system.py b/daemon/dnfdaemon-system.py
index a7a7e1dc6ef0d11994a30883aaee8ddbe2fdfdff..919b982d1a9d2c2947f0623c26dbbe46a9d6e300 100755
--- a/daemon/dnfdaemon-system.py
+++ b/daemon/dnfdaemon-system.py
@@ -104,7 +104,7 @@ class DnfDaemon(dnfdaemon.server.DnfDaemonBase):
                          sender_keyword='sender')
     def Lock(self, sender=None):
         """
-        Get the yum lock
+        Get the dnfdaemon lock
         :param sender:
         """
         self.check_permission_read(sender)
@@ -699,13 +699,15 @@ class DnfDaemon(dnfdaemon.server.DnfDaemonBase):
 
     def check_lock(self, sender):
         """
-        Check that the current sender is owning the dnf lock
+        Check that the current sender is owning the dnfdaemon lock
         :param sender:
         """
         if self._lock == sender:
             return True
+        elif self._lock:
+            raise LockedError('dnfdaemon is locked by another application')
         else:
-            raise LockedError('dnf is locked by another application')
+            raise LockedError('dnfdaemon is not locked, but was expected to be')
 
     def check_permission_write(self, sender):
         """ Check for senders permission to update system packages"""