diff --git a/distro/changelog.xml b/distro/changelog.xml
index e7b5e66..613e1e5 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -2,10 +2,12 @@
 	<Changeset component="org.gcube.portal.social-mail-servlet.2-1-1"
 		date="2017-02-03">
 		<Change>Minor refactor for comment replies</Change>
+		<Change>Resilient to Email server failures</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portal.social-mail-servlet.2-1-0"
 		date="2016-08-31">
-		<Change>Added possibility to change poller time at runtime as well as to quit it by editing a property file in the server</Change>
+		<Change>Added possibility to change poller time at runtime as well as
+			to quit it by editing a property file in the server</Change>
 		<Change>Added support for Auth2</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portal.social-mail-servlet.1-4-0"
diff --git a/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java b/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
index 5e3ace0..f91b5d8 100644
--- a/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
+++ b/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
@@ -96,9 +96,9 @@ public class PeriodicTask implements Runnable {
 	public void run() {
 		boolean keepPolling = true;
 		while (keepPolling) {
-			_log.debug("PeriodicTask starting for portal/site having name: " + popAccount.getPortalName());
-			check(popAccount.getPortalName(), popAccount.getPop3Server(), popAccount.getPop3user(), popAccount.getPop3password());
 			try {
+				_log.debug("PeriodicTask starting for portal/site having name: " + popAccount.getPortalName());
+				check(popAccount.getPortalName(), popAccount.getPop3Server(), popAccount.getPop3user(), popAccount.getPop3password());
 				int pollingInterval = getPollingInterval();
 				if (pollingInterval > 0) {
 					_log.debug("EmailParser restarts in " + pollingInterval + " minutes, to change this polling delay edit gcube-data.properties file under $CATALINA_HOME/conf");
@@ -108,7 +108,7 @@ public class PeriodicTask implements Runnable {
 					_log.info("EmailParser stopped for " + popAccount.getPortalName() + ", found value less than 1 in gcube-data.properties file under $CATALINA_HOME/conf");
 					keepPolling = false;
 				}
-			} catch (InterruptedException e) {
+			} catch (Exception e) {
 				e.printStackTrace();
 			}
 		}
@@ -191,7 +191,7 @@ public class PeriodicTask implements Runnable {
 		userRoles.add(DEFAULT_ROLE);
 		session.setSecurityToken(null);
 		String token = authorizationService().generateUserToken(new UserInfo(session.getUsername(), userRoles), scope);
-		
+
 		_log.debug("received token: "+token);
 		session.setSecurityToken(token);
 		_log.debug("PeriodicTask EmailParser: Security token set in session for: "+username + " on " + scope);