diff --git a/drupal/sites/all/modules/contrib/apachesolr_autocomplete/apachesolr_autocomplete_jqueryui.js b/drupal/sites/all/modules/contrib/apachesolr_autocomplete/apachesolr_autocomplete_jqueryui.js
index db41d8a..4685acd 100644
--- a/drupal/sites/all/modules/contrib/apachesolr_autocomplete/apachesolr_autocomplete_jqueryui.js
+++ b/drupal/sites/all/modules/contrib/apachesolr_autocomplete/apachesolr_autocomplete_jqueryui.js
@@ -7,8 +7,11 @@
 Drupal.apachesolr_autocomplete = {
   processOne: function(key, settings, context) {
     // Look for items with the data-apachesolr-autocomplete-id attribute.
-    jQuery(".apachesolr-autocomplete[data-apachesolr-autocomplete-id='"+ key +"']", context)
-    .autocomplete({
+    autoCompleteElement = jQuery(
+      ".apachesolr-autocomplete[data-apachesolr-autocomplete-id='"+ key +"']",
+      context
+    );
+    autoCompleteElement.autocomplete({
         // TODO: source should be a function, which should add any client-side filters to autocomplete request.
         source: settings.path,
         // TODO: autocomplete select event should handle more actions on select: filling/submitting the textfield, jumping to URL... others?
@@ -34,9 +37,11 @@ Drupal.apachesolr_autocomplete = {
         minLength: 2,
         delay: 400
     })
-    .addClass('form-autocomplete')
-    .data('autocomplete')._renderItem = Drupal.apachesolr_autocomplete.renderItem
-    ;
+    .addClass('form-autocomplete');
+    if (typeof autoCompleteElement.data('autocomplete') != 'undefined') {
+      autoCompleteElement.data('autocomplete')._renderItem =
+        Drupal.apachesolr_autocomplete.renderItem;
+    }
   },
     // TODO: USe JS-side theming. See http://engineeredweb.com/blog/11/5/javascript-theme-functions-drupal/
   renderItem: function (ul, item) {