diff --git a/core/src/mindustry/client/ui/FindDialog.kt b/core/src/mindustry/client/ui/FindDialog.kt
index 5a2e5279d7..f0dca14b57 100644
--- a/core/src/mindustry/client/ui/FindDialog.kt
+++ b/core/src/mindustry/client/ui/FindDialog.kt
@@ -33,6 +33,7 @@ object FindDialog : BaseDialog("@client.find") {
     init {
         for ((i, img) in images.withIndex()) {
             img.clicked { // When image clicked, select it
+                if (guesses.size <= i) return@clicked
                 val gi = guesses[i]
                 guesses[i] = guesses[0]
                 guesses[0] = gi
diff --git a/core/src/mindustry/client/utils/AutoTransfer.kt b/core/src/mindustry/client/utils/AutoTransfer.kt
index 440e4cec67..5dc89261ff 100644
--- a/core/src/mindustry/client/utils/AutoTransfer.kt
+++ b/core/src/mindustry/client/utils/AutoTransfer.kt
@@ -146,7 +146,7 @@ class AutoTransfer {
 
     /** Transfers outputs from blocks into core/containers */
     private fun drain(): Boolean { // FINISHME: Until this class is refactored to have a more generic input output system I'm just gonna copy a lot of code into this function
-        core = player.closestCore()
+        core = player.closestCore() ?: return@drain false
         val nearCore = player.within(core, itemTransferRange)
         if (!nearCore) core = null