diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
index 36f51bfe..e43ff3ed 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
@@ -22,7 +22,9 @@ import com.wisemapping.model.Collaboration;
 import com.wisemapping.model.Collaborator;
 import com.wisemapping.model.User;
 import com.wisemapping.model.AccessAuditory;
+import org.hibernate.ObjectNotFoundException;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 import org.springframework.security.authentication.encoding.PasswordEncoder;
 //import org.acegisecurity.providers.encoding.PasswordEncoder;
@@ -69,8 +71,15 @@ public class UserManagerImpl
         return cola;
     }
 
+    @Nullable
     public User getUserBy(long id) {
-        return getHibernateTemplate().get(User.class, id);
+        User user = null;
+        try{
+            user = getHibernateTemplate().get(User.class, id);
+        } catch (ObjectNotFoundException e){
+            // Ignore ...
+        }
+        return user;
     }
 
     @Override
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
index 01977770..d6877a36 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
@@ -135,43 +135,35 @@ public class AdminController extends BaseController {
 
         for (int i = minUid; i < maxUid; i++) {
             System.out.println("Looking for user:" + i);
-            try {
-                final User user = userService.getUserBy(i);
-                if (user != null) {
-                    // Do not process admin accounts ...
-                    if (user.getEmail().contains("wisemapping")) {
-                        continue;
-                    }
+            final User user = userService.getUserBy(i);
+            if (user != null) {
+                // Do not process admin accounts ...
+                if (user.getEmail().contains("wisemapping")) {
+                    continue;
+                }
 
-                    // Iterate over the list of maps ...
-                    final List<Collaboration> collaborations = mindmapService.findCollaborations(user);
-                    for (Collaboration collaboration : collaborations) {
-                        final Mindmap mindmap = collaboration.getMindMap();
-                        if (MindmapFilter.MY_MAPS.accept(mindmap, user)) {
+                // Iterate over the list of maps ...
+                final List<Collaboration> collaborations = mindmapService.findCollaborations(user);
+                for (Collaboration collaboration : collaborations) {
+                    final Mindmap mindmap = collaboration.getMindMap();
+                    if (MindmapFilter.MY_MAPS.accept(mindmap, user)) {
 
-                            final Calendar yearAgo = Calendar.getInstance();
-                            yearAgo.add(Calendar.MONTH, -18);
-                            // The use has only two maps... When they have been modified ..
-                            System.out.println("Checking map id:" + mindmap.getId());
-                            if (mindmap.getLastModificationTime().before(yearAgo) && !mindmap.isPublic()) {
-                                System.out.println("Old map. Is simple ?:" + mindmap.getId());
+                        final Calendar yearAgo = Calendar.getInstance();
+                        yearAgo.add(Calendar.MONTH, -8);
+                        // The use has only two maps... When they have been modified ..
+                        System.out.println("Checking map id:" + mindmap.getId());
+                        if (mindmap.getLastModificationTime().before(yearAgo) && !mindmap.isPublic()) {
+                            System.out.println("Old map. Is simple ?:" + mindmap.getId());
 
-                                if (isWelcomeMap(mindmap) || isSimpleMap(mindmap)) {
-                                    System.out.println("Purged map id:" + mindmap.getId() + ", userId:" + user.getId());
-                                    if (apply) {
-                                        mindmapService.removeMindmap(mindmap, user);
-                                    }
+                            if (isWelcomeMap(mindmap) || isSimpleMap(mindmap)) {
+                                System.out.println("Purged map id:" + mindmap.getId() + ", userId:" + user.getId());
+                                if (apply) {
+                                    mindmapService.removeMindmap(mindmap, user);
                                 }
                             }
                         }
                     }
                 }
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-            } catch (WiseMappingException e) {
-                e.printStackTrace();
-            } catch (RuntimeException e) {
-                e.printStackTrace();
             }
         }