diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml
index 64abe92..bd1fffc 100644
--- a/src/.idea/misc.xml
+++ b/src/.idea/misc.xml
@@ -11,7 +11,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/src/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml
index 8880307..b23efec 100644
--- a/src/app/src/main/AndroidManifest.xml
+++ b/src/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application
         android:allowBackup="true"
diff --git a/src/app/src/main/java/com/xfarrow/locatemydevice/MainActivity.java b/src/app/src/main/java/com/xfarrow/locatemydevice/MainActivity.java
index e1d29ae..797694d 100644
--- a/src/app/src/main/java/com/xfarrow/locatemydevice/MainActivity.java
+++ b/src/app/src/main/java/com/xfarrow/locatemydevice/MainActivity.java
@@ -45,7 +45,8 @@ public class MainActivity extends AppCompatActivity {
                             Manifest.permission.SEND_SMS,
                             Manifest.permission.ACCESS_COARSE_LOCATION,
                             Manifest.permission.ACCESS_FINE_LOCATION,
-                            Manifest.permission.CALL_PHONE
+                            Manifest.permission.CALL_PHONE,
+                            Manifest.permission.ACCESS_WIFI_STATE
                     },
                     Utils.PERMISSION_MULTIPLE
             );
diff --git a/src/app/src/main/java/com/xfarrow/locatemydevice/SmsHandler.java b/src/app/src/main/java/com/xfarrow/locatemydevice/SmsHandler.java
index 6728255..1241e75 100644
--- a/src/app/src/main/java/com/xfarrow/locatemydevice/SmsHandler.java
+++ b/src/app/src/main/java/com/xfarrow/locatemydevice/SmsHandler.java
@@ -235,6 +235,7 @@ public class SmsHandler {
             context.startActivity(intent);
         }
 
+        // wifi
         else if(providedOption.equals(Utils.WIFI_OPTION)){
             StringBuilder responseSms = new StringBuilder();
             WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
@@ -247,7 +248,10 @@ public class SmsHandler {
                 responseSms.append("Yes\n");
 
                 WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-                responseSms.append("SSID: ").append(wifiInfo.getSSID()).append("\n");
+                String ssid = (wifiInfo.getSSID().equals(WifiManager.UNKNOWN_SSID))?
+                        "Not connected or unknown" : wifiInfo.getSSID();
+
+                responseSms.append("SSID: ").append(ssid).append("\n");
                 responseSms.append("BSSID: ").append(wifiInfo.getBSSID()).append("\n");
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                     responseSms.append("Strength: ").append(wifiManager.calculateSignalLevel(wifiInfo.getRssi()))