diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index 61cff3be0..a1fc47553 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -670,7 +670,7 @@ function onClickSave() {
             if (input) {
               input.closest('.form-group').addClass('has-error');
               input.parent().append("<span class='help-block'>" +
-                                    val.value[0] + '<br /></span>');
+                                    val.data[0] + '<br /></span>');
             }
           });
         });
diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb
index 2d52bdecc..69ed6a3cf 100644
--- a/app/controllers/repository_rows_controller.rb
+++ b/app/controllers/repository_rows_controller.rb
@@ -39,7 +39,7 @@ class RepositoryRowsController < ApplicationController
           )
           unless cell_value.save
             errors[:repository_cells] << {
-              "#{cell.repository_column.id}": cell_value.errors.messages
+              "#{column.id}": cell_value.errors.messages
             }
             raise ActiveRecord::RecordInvalid
           end
@@ -106,7 +106,8 @@ class RepositoryRowsController < ApplicationController
             existing.value.data = value
             unless existing.value.save
               errors[:repository_cells] << {
-                "#{cell.repository_column_id}": existing.value.errors.messages
+                "#{existing.repository_column_id}":
+                existing.value.errors.messages
               }
               raise ActiveRecord::RecordInvalid
             end