diff --git a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/AddEditMemoryActivity.java b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/AddEditMemoryActivity.java
index 724a9d34..73d16124 100644
--- a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/AddEditMemoryActivity.java
+++ b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/AddEditMemoryActivity.java
@@ -27,6 +27,7 @@ kv4p HT (see http://kv4p.com)
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.material.textfield.TextInputEditText;
 import com.vagell.kv4pht.R;
@@ -122,6 +123,25 @@ public void run() {
                     AutoCompleteTextView editMemoryGroupTextInputEditText = findViewById(R.id.editMemoryGroupTextInputEditText);
                     editMemoryGroupTextInputEditText.setText(selectedMemoryGroup, false);
                 }
+
+                String offset = extras.getString("offset");
+                if (offset != null) {
+                    AutoCompleteTextView editOffset = findViewById(R.id.editOffsetTextView);
+                    editOffset.setText(offset, false);
+                }
+
+                String tone = extras.getString("tone");
+                if (tone != null) {
+                    AutoCompleteTextView editTone = findViewById(R.id.editToneTextView);
+                    editTone.setText(tone, false);
+                }
+
+                String name = extras.getString("name");
+                if (name != null) {
+                    TextInputEditText editNameTextInputEditText = findViewById(R.id.editNameTextInputEditText);
+                    editNameTextInputEditText.setText(name);
+                }
+
             }
         }
 
@@ -160,6 +180,13 @@ private void populateMemoryGroups() {
         threadPoolExecutor.execute(new Runnable() {
             @Override
             public void run() {
+                if( MainViewModel.appDb == null ) {
+                    //For example direct call other app intent.
+                    //If app is not already open do not nullpointer-exception.
+                    MainViewModel preloader = new MainViewModel();
+                    preloader.setActivity(activity);
+                    preloader.loadData();
+                }
                 List<String> memoryGroups = MainViewModel.appDb.channelMemoryDao().getGroups();
 
                 // Remove any blank memory groups from the list (shouldn't have been saved, ideally).