diff --git a/src/android/NetworkManager.java b/src/android/NetworkManager.java
index b7ba990..2327454 100755
--- a/src/android/NetworkManager.java
+++ b/src/android/NetworkManager.java
@@ -128,7 +128,9 @@
             String connectionType = "";
             try {
                 connectionType = this.getConnectionInfo(info).get("type").toString();
-            } catch (JSONException e) { }
+            } catch (JSONException e) {
+                Log.d(LOG_TAG, e.getLocalizedMessage());
+            }
 
             PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, connectionType);
             pluginResult.setKeepCallback(true);
@@ -172,7 +174,9 @@
             String connectionType = "";
             try {
                 connectionType = thisInfo.get("type").toString();
-            } catch (JSONException e) { }
+            } catch (JSONException e) {
+                Log.d(LOG_TAG, e.getLocalizedMessage());
+            }
 
             sendUpdate(connectionType);
             lastInfo = thisInfo;
@@ -207,7 +211,9 @@
         try {
             connectionInfo.put("type", type);
             connectionInfo.put("extraInfo", extraInfo);
-        } catch (JSONException e) { }
+        } catch (JSONException e) {
+            Log.d(LOG_TAG, e.getLocalizedMessage());
+        }
 
         return connectionInfo;
     }
diff --git a/src/ios/CDVReachability.m b/src/ios/CDVReachability.m
index c60261a..1399867 100644
--- a/src/ios/CDVReachability.m
+++ b/src/ios/CDVReachability.m
@@ -142,6 +142,9 @@
             retVal->reachabilityRef = reachability;
             retVal->localWiFiRef = NO;
         }
+        else {
+            CFRelease(reachability);
+        }
     }
     return retVal;
 }
@@ -156,6 +159,9 @@
             retVal->reachabilityRef = reachability;
             retVal->localWiFiRef = NO;
         }
+        else {
+            CFRelease(reachability);
+        }
     }
     return retVal;
 }
