--- a/javaextensions/bluetooth/bluetoothcommons/bluetoothplatformcontrol/src/btplatformcontrolnative.cpp	Fri Sep 17 08:28:21 2010 +0300
+++ b/javaextensions/bluetooth/bluetoothcommons/bluetoothplatformcontrol/src/btplatformcontrolnative.cpp	Mon Oct 04 00:10:53 2010 +0300
@@ -51,7 +51,7 @@
     {
         result = java::util::JniUtils::wstringToJstring(aJni, *devAddress);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         result = NULL;
     }
@@ -82,20 +82,22 @@
     }
 
     std::wstring *devName = control->getBluetoothName();
-    jstring result;
+
+    jstring result = NULL;
     try
     {
-        result = java::util::JniUtils::wstringToJstring(aJni, *devName);
+        if (NULL != devName)
+        {
+            result = java::util::JniUtils::wstringToJstring(aJni, *devName);
+        }
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         result = NULL;
     }
 
-
     delete devName;
     delete control;
-
     return result;
 }
 
@@ -224,7 +226,7 @@
     {
         name = java::util::JniUtils::jstringToWstring(aJni, appName);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         name=L"Unknown Application";
     }
@@ -270,7 +272,7 @@
     {
         name = java::util::JniUtils::jstringToWstring(aJni, appName);
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         name=L"Unknown Application";
     }
@@ -327,7 +329,7 @@
         result =  java::util::JniUtils::wstringToJstring(aJni,
                   control->getSystemProperty(aPropertyId));
     }
-    catch (ExceptionBase ex)
+    catch (ExceptionBase &ex)
     {
         result = NULL;
     }