diff --git a/src/main/java/florizz/core/Ui.java b/src/main/java/florizz/core/Ui.java
index 3fe4adfb54..975f1a0720 100644
--- a/src/main/java/florizz/core/Ui.java
+++ b/src/main/java/florizz/core/Ui.java
@@ -5,6 +5,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.NoSuchElementException;
 import java.util.Scanner;
 
 public class Ui {
@@ -42,7 +43,11 @@ public static void printBreakLine(){
      * @return Returns the user input as one String.
      */
     public String getInput(){
-        return inputScanner.nextLine();
+        try{
+            return inputScanner.nextLine();
+        } catch(NoSuchElementException | IllegalStateException error){
+            return "bye";
+        }
     }
 
     /**