diff --git a/gradle.properties b/gradle.properties
index 0a337f6a1..3591b774a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.1.3-SNAPSHOT
+VERSION_NAME=2.1.4-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application
diff --git a/opensrp-app/src/main/java/org/smartregister/login/interactor/BaseLoginInteractor.java b/opensrp-app/src/main/java/org/smartregister/login/interactor/BaseLoginInteractor.java
index 42c3d0221..ec3a5374f 100644
--- a/opensrp-app/src/main/java/org/smartregister/login/interactor/BaseLoginInteractor.java
+++ b/opensrp-app/src/main/java/org/smartregister/login/interactor/BaseLoginInteractor.java
@@ -109,7 +109,10 @@ private void localLogin(WeakReference<BaseLoginContract.View> view, String userN
     private void navigateToHomePage(String userName) {
 
         getUserService().localLoginWith(userName);
-        getLoginView().goToHome(false);
+
+        if (mLoginPresenter != null) {
+            getLoginView().goToHome(false);
+        }
 
         CoreLibrary.getInstance().initP2pLibrary(userName);
 
@@ -230,7 +233,7 @@ public BaseLoginContract.View getLoginView() {
     }
 
     public UserService getUserService() {
-        return mLoginPresenter.getOpenSRPContext().userService();
+        return CoreLibrary.getInstance().context().userService();
     }
 
     /**