diff --git a/core/src/org/transdroid/core/service/ConnectivityHelper.java b/core/src/org/transdroid/core/service/ConnectivityHelper.java
index be7d1775..a4e1805f 100644
--- a/core/src/org/transdroid/core/service/ConnectivityHelper.java
+++ b/core/src/org/transdroid/core/service/ConnectivityHelper.java
@@ -46,7 +46,7 @@ public class ConnectivityHelper {
 	}
 
 	public String getConnectedNetworkName() {
-		if (wifiManager.getConnectionInfo() != null) {
+		if (wifiManager.getConnectionInfo() != null && wifiManager.getConnectionInfo().getSSID() != null) {
 			return wifiManager.getConnectionInfo().getSSID().replace("\"", "");
 		}
 		return null;
diff --git a/full/AndroidManifest.xml b/full/AndroidManifest.xml
index 61202835..0f4a0f9b 100644
--- a/full/AndroidManifest.xml
+++ b/full/AndroidManifest.xml
@@ -233,7 +233,7 @@
 		<service android:name="org.transdroid.core.service.AppUpdateService_" />
 
 		<receiver android:name="org.transdroid.core.service.AlarmReceiver_" />
-		<receiver android:name="org.transdroid.core.service.BootReceiver_" >
+		<receiver android:name="org.transdroid.core.service.BootReceiver" >
 			<intent-filter>
 				<action
 					android:name="android.intent.action.BOOT_COMPLETED"
diff --git a/lite/AndroidManifest.xml b/lite/AndroidManifest.xml
index 327a5fef..c755ef75 100644
--- a/lite/AndroidManifest.xml
+++ b/lite/AndroidManifest.xml
@@ -178,7 +178,7 @@
 		<service android:name="org.transdroid.core.service.AppUpdateService_" />
 
 		<receiver android:name="org.transdroid.core.service.AlarmReceiver_" />
-		<receiver android:name="org.transdroid.core.service.BootReceiver_" >
+		<receiver android:name="org.transdroid.core.service.BootReceiver" >
 			<intent-filter>
 				<action
 					android:name="android.intent.action.BOOT_COMPLETED"