diff --git a/lib/linear/commands/issue/take.rb b/lib/linear/commands/issue/take.rb
index 08d9c9c..6e5e75d 100644
--- a/lib/linear/commands/issue/take.rb
+++ b/lib/linear/commands/issue/take.rb
@@ -21,6 +21,7 @@ class Take
 
           def call(issue_ids:, **options)
             updates = issue_ids.map do |issue_id|
+              Rubyists::Linear::Issue.find(issue_id)
               gimme_da_issue! issue_id # gimme_da_issue! is defined in Rubyists::Linear::CLI::Issue
             rescue NotFoundError => e
               logger.warn e.message
diff --git a/lib/linear/models/base_model/class_methods.rb b/lib/linear/models/base_model/class_methods.rb
index 867e0f1..b0b0625 100644
--- a/lib/linear/models/base_model/class_methods.rb
+++ b/lib/linear/models/base_model/class_methods.rb
@@ -55,7 +55,7 @@ def find(id_val)
           sym = camel_name.to_sym
           ff = full_fragment
           query_data = Api.query(query { __node(camel_name, id: id_val) { ___ ff } })
-          raise NotFoundError, "No #{just_name} found with id #{id_val}" if query_data[sym].nil?
+          raise NotFoundError, "No #{just_name} found with id #{id_val}" if query_data.nil? || query_data[sym].nil?
 
           new query_data[sym]
         end