diff --git a/src/remote_generator/services/dependency_group.rb b/src/remote_generator/services/dependency_group.rb
index 3c188da..6b977ef 100644
--- a/src/remote_generator/services/dependency_group.rb
+++ b/src/remote_generator/services/dependency_group.rb
@@ -30,7 +30,11 @@ def initialize(dependencies, name:)
 
         def collision_data_for(dep)
           key = to_key(dep)
-          collision_data[key]
+          collision_data[key].tap do |cd|
+            unless cd
+              raise "Dependency #{dep} is not part of this dependency group"
+            end
+          end
         end
 
         def set_collision_data_for(dep, collision_data)
diff --git a/src/remote_generator/templates/Command/Result.ts.erb b/src/remote_generator/templates/Command/Result.ts.erb
index 094cd56..48759ec 100644
--- a/src/remote_generator/templates/Command/Result.ts.erb
+++ b/src/remote_generator/templates/Command/Result.ts.erb
@@ -3,5 +3,5 @@
 import { <%= entity_generator.all_names.join(", ") %> } from "<%= path_to_root %><%= entity_generator.import_path %>"
 <% end %>
 
-export default <%= foobara_type_to_ts_type(inputs_type, name: "Result") %>
+export default <%= foobara_type_to_ts_type(result_type, name: "Result") %>