diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 500ba523..3f64d536 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -734,7 +734,7 @@ public class CordovaWebView extends WebView {
         {
             //Switch back to the old browser history and state the six month policy
             this.useBrowserHistory = false;
-            Log.w(TAG, "useBrowserHistory=false is deprecated. We will be removing this feature entirely in six months.  Please use the browser history and use history.back().");
+            Log.w(TAG, "useBrowserHistory=false is deprecated as of Cordova 2.2.0 and will be removed six months after the 2.2.0 release.  Please use the browser history and use history.back().");
         }
  
         if ("true".equals(this.getProperty("fullscreen", "false"))) {
diff --git a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
index 55fa2054..03a69b1d 100755
--- a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
+++ b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
@@ -398,7 +398,12 @@ public class NativeToJsMessageQueue {
                     ret += 1 + pluginResult.getMessage().length();
                     break;
                 case PluginResult.MESSAGE_TYPE_STRING: // s
-                    ret += 1 + pluginResult.getStrMessage().length();
+                    if (pluginResult.getStrMessage() == null) {
+                        ret += 1;
+                    }
+                    else {
+                        ret += 1 + pluginResult.getStrMessage().length();
+                    }
                     break;
                 case PluginResult.MESSAGE_TYPE_JSON:
                 default:
@@ -433,8 +438,10 @@ public class NativeToJsMessageQueue {
                       .append(pluginResult.getMessage());
                     break;
                 case PluginResult.MESSAGE_TYPE_STRING: // s
-                    sb.append('s')
-                      .append(pluginResult.getStrMessage());
+                    sb.append('s');
+                    if (pluginResult.getStrMessage() != null) {
+                        sb.append(pluginResult.getStrMessage());
+                    }
                     break;
                 case PluginResult.MESSAGE_TYPE_JSON:
                 default: