diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 8e7f0a890..ba458335d 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -221,7 +221,7 @@ class AssetsController < ApplicationController
             @assoc,
             @assoc.my_module.experiment.project,
             my_module: @assoc.my_module.id,
-            file: @asset.file_file_name
+            file: @asset.file_name
           )
         else
           log_step_activity(
@@ -229,7 +229,7 @@ class AssetsController < ApplicationController
             @assoc,
             nil,
             protocol: @assoc.protocol.id,
-            file: @asset.file_file_name
+            file: @asset.file_name
           )
         end
       when Result
diff --git a/app/models/step_text.rb b/app/models/step_text.rb
index 728f4347b..2faf98b82 100644
--- a/app/models/step_text.rb
+++ b/app/models/step_text.rb
@@ -11,6 +11,8 @@ class StepText < ApplicationRecord
   has_many :step_orderable_elements, as: :orderable, dependent: :destroy
 
   def name
+    return if text.blank?
+
     strip_tags(text.truncate(64))
   end
 end