diff --git a/app/database/migrations/2015_11_26_195528_import_ldap_settings.php b/app/database/migrations/2015_11_26_195528_import_ldap_settings.php
index 311fe16d01..1529c4058f 100644
--- a/app/database/migrations/2015_11_26_195528_import_ldap_settings.php
+++ b/app/database/migrations/2015_11_26_195528_import_ldap_settings.php
@@ -18,8 +18,8 @@ class ImportLdapSettings extends Migration {
     // Only update the settings record if there IS an LDAP Config
     // AND the Settings table doesn't already have LDAP settings in it
 
-		if ((Config::get('ldap.url')) && ($settings->ldap_server=='')) {
-      
+		if ((Config::get('ldap.url'))  && ($settings) && ($settings->ldap_server)) {
+
       $settings->ldap_enabled = 1;
       $settings->ldap_server = Config::get('ldap.url');
       $settings->ldap_uname = Config::get('ldap.username');