diff --git a/app/build.gradle b/app/build.gradle
index fe3d8429c7..eb80a6da2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ kapt {
 def VERSION_NAME = "2.0.5"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
     compileOptions {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
@@ -41,7 +41,7 @@ android {
     defaultConfig {
         applicationId "com.naviapp"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 81
         versionName VERSION_NAME
         multiDexEnabled true
diff --git a/app/src/main/java/com/naviapp/common/activity/NaviWebViewActivity.kt b/app/src/main/java/com/naviapp/common/activity/NaviWebViewActivity.kt
index 8757c83454..83b42067fe 100644
--- a/app/src/main/java/com/naviapp/common/activity/NaviWebViewActivity.kt
+++ b/app/src/main/java/com/naviapp/common/activity/NaviWebViewActivity.kt
@@ -58,7 +58,7 @@ class NaviWebViewActivity : BaseActivity() {
                 getJavascriptInterfaceName() ?: JAVA_SCRIPT_NAME_DEFAULT
             )
         }
-        val url = intent.getStringExtra(Constants.WEB_URL)
+        val url = intent.getStringExtra(Constants.WEB_URL).orEmpty()
         binding.webView.loadUrl(url)
         binding.webView.webChromeClient = object : WebChromeClient() {
             //For Android 5.0+
diff --git a/app/src/main/java/com/naviapp/personalloan/getloan/summary/activities/LoanAgreementActivity.kt b/app/src/main/java/com/naviapp/personalloan/getloan/summary/activities/LoanAgreementActivity.kt
index cde73253ce..c2e7c8c8fc 100644
--- a/app/src/main/java/com/naviapp/personalloan/getloan/summary/activities/LoanAgreementActivity.kt
+++ b/app/src/main/java/com/naviapp/personalloan/getloan/summary/activities/LoanAgreementActivity.kt
@@ -37,7 +37,7 @@ class LoanAgreementActivity : BaseActivity(), View.OnClickListener {
         binding.headerView.backIv.setOnClickListener(this)
         viewModel.loanAgreement.observeNonNull(this) {
             hideLoader()
-            binding.loanAgreementWv.loadUrl(it.rawUri)
+            binding.loanAgreementWv.loadUrl(it.rawUri.orEmpty())
         }
     }