diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
index 1a9b3d96..a14e5e8b 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
@@ -211,6 +211,8 @@ public class MainActivity extends ActionBarActivity implements
 					setBluetoothStatusIcon(R.drawable.bluetooth_connection_success);
 					ScaleData scaleBtData = (ScaleData) msg.obj;
 
+					scaleBtData.setConvertedWeight(scaleBtData.getWeight(), OpenScale.getInstance(getApplicationContext()).getSelectedScaleUser().scale_unit);
+
 					if (OpenScale.getInstance(getApplicationContext()).addScaleData(scaleBtData) == -1) {
 						Toast.makeText(getApplicationContext(), getResources().getString(R.string.info_no_selected_user), Toast.LENGTH_SHORT).show();
 					}
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
index 2ace95fe..ade64c5a 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
@@ -156,8 +156,10 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
         }
         if (subpageView.getChildCount() > 1) {
             TextView selectedSubpageNrView = (TextView) subpageView.getChildAt(selectedSubpageNr + 1);
-            selectedSubpageNrView.setTypeface(null, Typeface.BOLD);
-            selectedSubpageNrView.setTextColor(ChartUtils.COLOR_BLUE);
+            if (selectedSubpageNrView != null) {
+                selectedSubpageNrView.setTypeface(null, Typeface.BOLD);
+                selectedSubpageNrView.setTextColor(ChartUtils.COLOR_BLUE);
+            }
         }
 
         Button moveSubpageRight = new Button(tableView.getContext());