diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
index af2229016..1da842eef 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
@@ -49,7 +49,7 @@ class App.ControllerGenericNew extends App.ControllerModal
           if ui.callback
             ui.callback( user )
           ui.modalHide()
-        App.Collection.find( ui.pageData.object, @id, callbackReload , true )
+        App.Collection.find( ui['genericObject'], @id, callbackReload , true )
 
       error: ->
         ui.log 'errors'
@@ -110,7 +110,7 @@ class App.ControllerGenericEdit extends App.ControllerModal
           if ui.callback
             ui.callback( user )
           ui.modalHide()
-        App.Collection.find( ui.pageData.object, @id, callbackReload , true )
+        App.Collection.find( ui['genericObject'], @id, callbackReload , true )
 
       error: =>
         ui.log 'errors'
diff --git a/app/assets/javascripts/app/lib/collection.js.coffee b/app/assets/javascripts/app/lib/collection.js.coffee
index ee97a66f8..6164f5caa 100644
--- a/app/assets/javascripts/app/lib/collection.js.coffee
+++ b/app/assets/javascripts/app/lib/collection.js.coffee
@@ -235,7 +235,10 @@ class _Singleton
     App[type].fetch()
 
   _sortBy: ( collection, attribute ) ->
-    _.sortBy( collection, (item) -> return item[ attribute ].toLowerCase() )
+    _.sortBy( collection, (item) ->
+      return '' if item[ attribute ] is undefined || item[ attribute ] is null
+      return item[ attribute ].toLowerCase()
+    )
 
   _filter: ( collection, filter ) ->
     for key, value of filter