diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
index 83cd885..8918b98 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
@@ -77,12 +77,14 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val params: Params = intent.extras!!.getParcelable(
-            "net.thauvin.erik.android.tesremoteprogrammer.models.Params"
-        )
-        val option: Option = intent.extras!!.getParcelable(
-            "net.thauvin.erik.android.tesremoteprogrammer.models.Option"
-        )
+        val params: Params =
+            intent?.extras?.getParcelable(
+                "net.thauvin.erik.android.tesremoteprogrammer.models.Params"
+            ) ?: Params()
+        val option: Option =
+            intent?.extras?.getParcelable(
+                "net.thauvin.erik.android.tesremoteprogrammer.models.Option"
+            ) ?: Option()
         val fields = arrayListOf<EditText>()
 
         coordinatorLayout {
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt
index df78edd..d4a1181 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt
@@ -29,6 +29,7 @@ data class Config(
         @JvmStatic
         private val serialVersionUID: Long = 1
 
+        @Suppress("unused")
         @JvmField
         val CREATOR: Parcelable.Creator<Config> = object : Parcelable.Creator<Config> {
             override fun createFromParcel(source: Parcel): Config = Config(source)
@@ -36,11 +37,12 @@ data class Config(
         }
     }
 
+    @Suppress("unused")
     constructor() : this(Params(), emptyList<Option>())
 
     constructor(source: Parcel) : this(
-        source.readParcelable<Params>(Params::class.java.classLoader),
-        source.createTypedArrayList(Option.CREATOR)
+        source.readParcelable<Params>(Params::class.java.classLoader) ?: Params(),
+        source.createTypedArrayList(Option.CREATOR) ?: emptyList()
     )
 
     override fun compareTo(other: Config): Int = params.name.compareTo(other.params.name)
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt
index d614c24..252b8d4 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt
@@ -19,6 +19,7 @@ package net.thauvin.erik.android.tesremoteprogrammer.models
 
 import android.os.Parcel
 import android.os.Parcelable
+import net.thauvin.erik.android.tesremoteprogrammer.util.ifNull
 import java.io.Serializable
 
 data class Field(
@@ -43,11 +44,12 @@ data class Field(
         }
     }
 
+    @Suppress("unused")
     constructor() : this("", "", false, false, false, -1, -1, -1, -1)
 
     constructor(source: Parcel) : this(
-        source.readString(),
-        source.readString(),
+        source.readString().ifNull(),
+        source.readString().ifNull(),
         1 == source.readInt(),
         1 == source.readInt(),
         1 == source.readInt(),
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
index ee06dac..96474a1 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
@@ -19,6 +19,7 @@ package net.thauvin.erik.android.tesremoteprogrammer.models
 
 import android.os.Parcel
 import android.os.Parcelable
+import net.thauvin.erik.android.tesremoteprogrammer.util.ifNull
 import java.io.Serializable
 
 data class Option(
@@ -42,11 +43,11 @@ data class Option(
     constructor() : this("", emptyList(), false, false, "")
 
     constructor(source: Parcel) : this(
-        source.readString(),
-        source.createTypedArrayList(Field.CREATOR),
+        source.readString().ifNull(),
+        source.createTypedArrayList(Field.CREATOR) ?: emptyList(),
         1 == source.readInt(),
         1 == source.readInt(),
-        source.readString()
+        source.readString().ifNull()
     )
 
     override fun compareTo(other: Option): Int = title.compareTo(other.title)
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Params.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Params.kt
index 394b42e..a751a3d 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Params.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Params.kt
@@ -19,6 +19,7 @@ package net.thauvin.erik.android.tesremoteprogrammer.models
 
 import android.os.Parcel
 import android.os.Parcelable
+import net.thauvin.erik.android.tesremoteprogrammer.util.ifNull
 import java.io.Serializable
 
 data class Params(
@@ -36,6 +37,7 @@ data class Params(
         @JvmStatic
         private val serialVersionUID: Long = 1
 
+        @Suppress("unused")
         @JvmField
         val CREATOR: Parcelable.Creator<Params> = object : Parcelable.Creator<Params> {
             override fun createFromParcel(source: Parcel): Params = Params(source)
@@ -46,15 +48,15 @@ data class Params(
     constructor() : this("", "", "", "", -1, "", "", "", "")
 
     constructor(source: Parcel) : this(
-        source.readString(),
-        source.readString(),
-        source.readString(),
-        source.readString(),
+        source.readString().ifNull(),
+        source.readString().ifNull(),
+        source.readString().ifNull(),
+        source.readString().ifNull(),
         source.readInt(),
-        source.readString(),
-        source.readString(),
-        source.readString(),
-        source.readString()
+        source.readString().ifNull(),
+        source.readString().ifNull(),
+        source.readString().ifNull(),
+        source.readString().ifNull()
     )
 
     override fun describeContents() = 0
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt
index b828b99..0b1c118 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt
@@ -25,6 +25,8 @@ fun String.isDKS(): Boolean = equals(Dtmf.DKS, true)
 
 fun String.isLinear(): Boolean = equals(Dtmf.LINEAR, true)
 
+fun String?.ifNull() = this ?: ""
+
 fun String.replaceAll(replace: Array<Pair<String, String>>): String {
     val result = StringBuilder(this)
     var offset: Int
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a00b91..b69f00d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources xmlns:xliff="http://schemas.android.com/tools">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <plurals name="error_digit">
         <item quantity="one">digit</item>
         <item quantity="other">digits</item>
@@ -11,7 +11,7 @@
     <string name="action_config">Configurations</string>
     <string name="alert_config_error">Configuration Errors</string>
     <string name="app_name">TES Remote Programmer</string>
-    <string name="cancel">Cancel</string>
+<!--    <string name="cancel">Cancel</string>-->
     <string name="dialog_import">Import</string>
     <string name="error_invalid">Invalid</string>
     <string name="error_invalid_dtmf">Invalid DTMF: <xliff:g id="type">%1$s</xliff:g></string>
@@ -23,7 +23,7 @@
     <string name="hint_master_code">Master Code</string>
     <string name="hint_phone_number">Phone Number</string>
     <string name="no_conf_req">No configuration required.</string>
-    <string name="ok">OK</string>
+<!--    <string name="ok">OK</string>-->
     <string name="programming_heading">PROGRAMMING</string>
     <string name="title_template_step">Step <xliff:g id="step_number">%1$d</xliff:g> of <xliff:g id="steps_count">%2$d</xliff:g></string>
     <string name="validate_dtmf_nopause">Missing pause between steps</string>