diff --git a/fidouaf/src/main/java/org/ebayopensource/fidouaf/res/FidoUafResource.java b/fidouaf/src/main/java/org/ebayopensource/fidouaf/res/FidoUafResource.java
index 0bcd5e0..7a4051c 100644
--- a/fidouaf/src/main/java/org/ebayopensource/fidouaf/res/FidoUafResource.java
+++ b/fidouaf/src/main/java/org/ebayopensource/fidouaf/res/FidoUafResource.java
@@ -214,7 +214,7 @@ private String readFacet() {
 			Properties props = new Properties();
 			props.load(in);
 			facetVal = props.getProperty("facetId");
-		} catch (IOException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		} 
 		return facetVal.toString();
diff --git a/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java b/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
index 9192ad5..47c43dc 100644
--- a/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
+++ b/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
@@ -140,7 +140,7 @@ public void info(View view) {
 
     public void regRequest(View view) {
 //        String username = Preferences.getSettingsParam("username");
-        String username = ((EditText) findViewById(R.id.editTextName)).getText().toString();
+        String username = ((EditText) findViewById(R.id.editTextName)).getText().toString().trim();
         if (username.equals ("")) {
             msg.setText("Username cannot be empty.");
             return;
@@ -250,13 +250,14 @@ public void trxRequest(View view) {
     }
 
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        Log.d(TAG, String.format("onActivityResult: requestCode=%d, resultCode=%d, data=%s",
-                requestCode, resultCode, new ArrayList<>(data.getExtras().keySet())));
-
         if (data == null){
             msg.setText("UAF Client didn't return any data. resultCode="+resultCode);
             return;
         }
+        //java.lang.NullPointerException may happened in data.getExtras()
+        Log.d(TAG, String.format("onActivityResult: requestCode=%d, resultCode=%d, data=%s",
+                requestCode, resultCode, new ArrayList<>(data.getExtras().keySet())));
+
 
         Object[] array = data.getExtras().keySet().toArray();
         StringBuffer extras = new StringBuffer();
diff --git a/fidouafclient/app/src/main/res/layout/activity_main.xml b/fidouafclient/app/src/main/res/layout/activity_main.xml
index 49a2bbf..75ba8df 100644
--- a/fidouafclient/app/src/main/res/layout/activity_main.xml
+++ b/fidouafclient/app/src/main/res/layout/activity_main.xml
@@ -40,6 +40,7 @@
         android:id="@+id/editTextName"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:singleLine="true"
         android:layout_toRightOf="@id/regButton"
         />