diff --git a/src/peers/sip/core/useragent/handlers/RegisterHandler.java b/src/peers/sip/core/useragent/handlers/RegisterHandler.java
index 4c0e93f..d0355a7 100644
--- a/src/peers/sip/core/useragent/handlers/RegisterHandler.java
+++ b/src/peers/sip/core/useragent/handlers/RegisterHandler.java
@@ -25,6 +25,8 @@ import java.util.Hashtable;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.pmw.tinylog.Logger;
 import peers.Config;
 
@@ -54,6 +56,7 @@ public class RegisterHandler extends MethodHandler
 
     public static final int REFRESH_MARGIN = 10; // seconds
 
+    @Setter
     private InitialRequestManager initialRequestManager;
 
     private Timer timer;
@@ -64,6 +67,7 @@ public class RegisterHandler extends MethodHandler
     
     //FIXME should be on a profile based context
     private boolean unregisterInvoked;
+    @Getter
     private boolean registered;
     
     public RegisterHandler(UserAgent userAgent,
@@ -132,7 +136,7 @@ public class RegisterHandler extends MethodHandler
     
     public void errResponseReceived(SipResponse sipResponse) {
         String password = userAgent.getConfig().getPassword();
-        if (password != null &&  !"".equals(password.trim())) {
+        if (password != null && !password.trim().isEmpty()) {
             int statusCode = sipResponse.getStatusCode();
             if (statusCode == RFC3261.CODE_401_UNAUTHORIZED
                     || statusCode ==
@@ -170,7 +174,7 @@ public class RegisterHandler extends MethodHandler
                     }
                 }
                 String received = via.getParam(receivedName);
-                if (received != null && !"".equals(received.trim())) {
+                if (received != null && !received.trim().isEmpty()) {
                     if (viaValue.equals(received)) {
                         notifyListener(sipResponse);
                     } else { // received != via ip address
@@ -180,10 +184,7 @@ public class RegisterHandler extends MethodHandler
                             Config config = userAgent.getConfig();
                             config.setPublicInetAddress(receivedInetAddress);
                             userAgent.register();
-                        } catch (UnknownHostException e) {
-                            notifyListener(sipResponse);
-                            Logger.error(e.getMessage(), e);
-                        } catch (SipUriSyntaxException e) {
+                        } catch (Exception e) {
                             notifyListener(sipResponse);
                             Logger.error(e.getMessage(), e);
                         }
@@ -237,7 +238,7 @@ public class RegisterHandler extends MethodHandler
         	// patch mobicents simple application
             registered = true;
             int delay = -1;
-            if (expires == null || "".equals(expires.trim())) {
+            if (expires == null || expires.trim().isEmpty()) {
                 delay = 3600;
             }
             if (!unregisterInvoked) {
@@ -246,7 +247,7 @@ public class RegisterHandler extends MethodHandler
             	}
                 timer = new Timer(getClass().getSimpleName()
                         + " refresh timer");
-                timer.schedule(new RefreshTimerTask(), delay * 1000);
+                timer.schedule(new RefreshTimerTask(), delay * 1000L);
             }
         }
         SipListener sipListener = userAgent.getSipListener();
@@ -266,10 +267,6 @@ public class RegisterHandler extends MethodHandler
         //TODO alert user
     }
 
-    public boolean isRegistered() {
-        return registered;
-    }
-    
     //////////////////////////////////////////////////////////
     // TimerTask
     //////////////////////////////////////////////////////////
@@ -286,8 +283,4 @@ public class RegisterHandler extends MethodHandler
         }
     }
 
-    public void setInitialRequestManager(InitialRequestManager initialRequestManager) {
-        this.initialRequestManager = initialRequestManager;
-    }
-
 }