diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractMultiStringSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractMultiStringSetting.kt
deleted file mode 100644
index ddd48306f..000000000
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractMultiStringSetting.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-package org.citra.citra_emu.features.settings.model
-
-interface AbstractMultiStringSetting : AbstractSetting {
-    var strings: MutableSet<String>
-}
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt
index 1c6fd8c14..bd89861f6 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt
@@ -38,7 +38,6 @@ import org.citra.citra_emu.databinding.ListItemSettingsHeaderBinding
 import org.citra.citra_emu.features.settings.model.AbstractBooleanSetting
 import org.citra.citra_emu.features.settings.model.AbstractFloatSetting
 import org.citra.citra_emu.features.settings.model.AbstractIntSetting
-import org.citra.citra_emu.features.settings.model.AbstractMultiStringSetting
 import org.citra.citra_emu.features.settings.model.AbstractSetting
 import org.citra.citra_emu.features.settings.model.AbstractStringSetting
 import org.citra.citra_emu.features.settings.model.FloatSetting
@@ -803,7 +802,8 @@ class SettingsAdapter(
     private fun getSelectionForStringMultiChoiceValue(item: StringMultiChoiceSetting): BooleanArray {
         val values = item.selectedValues;
         val available_values = item.values;
-        val res = BooleanArray(available_values?.size ?: 10){false}
+        val res = BooleanArray(available_values?.size ?: 10){false} // 10 is used because we have 10 reasonable options.
+                                                                    // prob shouldn't hardcode the size value here
 
 
         if (available_values != null) {
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
index 943b93a49..603fd1796 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
@@ -27,13 +27,13 @@ object ComboHelper {
     }
 
     fun comboActivate(button: InputOverlayDrawableButton) {
-        var comboArray = StringListSetting.COMBO_KEYS.list
+        val comboArray = StringListSetting.COMBO_KEYS.list
         for (selected_button in comboArray) {
-            var native_button = getButton(selected_button)
+            val native_button = getButton(selected_button)
             if (native_button == -1)
             {
-                //TODO: Need proper error handling here
-                println("Bad Button")
+                val cause = IllegalStateException("Button is not in bindable inputs.")
+                throw IllegalArgumentException("Input must be non-negative.", cause)
             }
             else
             {