diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index eb59faee..cdbaa525 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -229,7 +229,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
     //     $users = $this->getGroupMembers();
 
     //     // now we delete the ldap entry
-    //     \ensure($this->entry->exists());
+    //     $this->entry->ensureExists();
     //     $this->entry->delete();
     //     $this->REDIS->removeCacheArray("sorted_groups", "", $this->gid);
     //     foreach ($users as $user) {
diff --git a/resources/lib/UnityUser.php b/resources/lib/UnityUser.php
index e910087d..f13352c6 100644
--- a/resources/lib/UnityUser.php
+++ b/resources/lib/UnityUser.php
@@ -145,7 +145,7 @@ public function setOrg($org)
 
     public function getOrg($ignorecache = false)
     {
-        \ensure($this->exists());
+        $this->entry->ensureExists();
         if (!$ignorecache) {
             $cached_val = $this->REDIS->getCache($this->uid, "org");
             if (!is_null($cached_val)) {
@@ -194,7 +194,7 @@ public function setFirstname($firstname, $operator = null)
      */
     public function getFirstname($ignorecache = false)
     {
-        \ensure($this->exists());
+        $this->entry->ensureExists();
         if (!$ignorecache) {
             $cached_val = $this->REDIS->getCache($this->uid, "firstname");
             if (!is_null($cached_val)) {
@@ -243,7 +243,7 @@ public function setLastname($lastname, $operator = null)
      */
     public function getLastname($ignorecache = false)
     {
-        \ensure($this->exists());
+        $this->entry->ensureExists();
         if (!$ignorecache) {
             $cached_val = $this->REDIS->getCache($this->uid, "lastname");
             if (!is_null($cached_val)) {
@@ -266,7 +266,7 @@ public function getLastname($ignorecache = false)
 
     public function getFullname()
     {
-        \ensure($this->exists());
+        $this->entry->ensureExists();
         return $this->getFirstname() . " " . $this->getLastname();
     }
 
@@ -298,7 +298,7 @@ public function setMail($email, $operator = null)
      */
     public function getMail($ignorecache = false)
     {
-        \ensure($this->exists());
+        $this->entry->ensureExists();
         if (!$ignorecache) {
             $cached_val = $this->REDIS->getCache($this->uid, "mail");
             if (!is_null($cached_val)) {
@@ -357,7 +357,7 @@ public function setSSHKeys($keys, $operator = null, $send_mail = true)
      */
     public function getSSHKeys($ignorecache = false)
     {
-        \ensure($this->exists());
+        $this->entry->ensureExists();
         if (!$ignorecache) {
             $cached_val = $this->REDIS->getCache($this->uid, "sshkeys");
             if (!is_null($cached_val)) {
@@ -431,7 +431,7 @@ public function setLoginShell($shell, $operator = null, $send_mail = true)
      */
     public function getLoginShell($ignorecache = false)
     {
-        \ensure($this->exists());
+        $this->entry->ensureExists();
         if (!$ignorecache) {
             $cached_val = $this->REDIS->getCache($this->uid, "loginshell");
             if (!is_null($cached_val)) {
@@ -476,7 +476,7 @@ public function setHomeDir($home, $operator = null)
      */
     public function getHomeDir($ignorecache = false)
     {
-        \ensure($this->exists());
+        $this->entry->ensureExists();
         if (!$ignorecache) {
             $cached_val = $this->REDIS->getCache($this->uid, "homedir");
             if (!is_null($cached_val)) {
diff --git a/resources/lib/phpopenldaper b/resources/lib/phpopenldaper
index 48dc2b89..eed8c05d 160000
--- a/resources/lib/phpopenldaper
+++ b/resources/lib/phpopenldaper
@@ -1 +1 @@
-Subproject commit 48dc2b897903fb226d50f24a262e192b942efe76
+Subproject commit eed8c05d71b711d83f2ee3b5567c570a37212ed9