diff --git a/app/models/concerns/foreman_wds/host_extensions.rb b/app/models/concerns/foreman_wds/host_extensions.rb
index 84ba02578e1cc379bf9e48ce99b427840fffffef..dcb216617dabc0d95f2222dacc7fd82982ea4f21 100644
--- a/app/models/concerns/foreman_wds/host_extensions.rb
+++ b/app/models/concerns/foreman_wds/host_extensions.rb
@@ -100,9 +100,9 @@ module ForemanWds
     end
 
     def ensure_wds_client
-      raise NotImplementedError, 'Not implemented yet'
       return unless wds?
 
+      raise NotImplementedError, 'Not implemented yet'
       client = wds_server.ensure_client(self)
 
       Rails.logger.info client
@@ -113,9 +113,9 @@ module ForemanWds
     end
 
     def remove_wds_client
-      raise NotImplementedError, 'Not implemented yet'
       return unless wds?
 
+      raise NotImplementedError, 'Not implemented yet'
       wds_server.delete_client(self)
       true
     rescue ScriptError, StandardError => ex