diff --git a/app/src/main/java/org/emunix/unipatcher/WorkerService.java b/app/src/main/java/org/emunix/unipatcher/WorkerService.java
index 9cddcec..3d40a4e 100644
--- a/app/src/main/java/org/emunix/unipatcher/WorkerService.java
+++ b/app/src/main/java/org/emunix/unipatcher/WorkerService.java
@@ -169,7 +169,9 @@ public class WorkerService extends IntentService {
             } else {
                 errorMsg = e.getMessage();
             }
-            FileUtils.deleteQuietly(outputFile);
+            if (outputFile.isFile()) {
+                FileUtils.deleteQuietly(outputFile);
+            }
         } finally {
             stopForeground(true);
         }
diff --git a/app/src/main/java/org/emunix/unipatcher/ui/fragment/CreatePatchFragment.java b/app/src/main/java/org/emunix/unipatcher/ui/fragment/CreatePatchFragment.java
index bbbdd36..6181e0f 100644
--- a/app/src/main/java/org/emunix/unipatcher/ui/fragment/CreatePatchFragment.java
+++ b/app/src/main/java/org/emunix/unipatcher/ui/fragment/CreatePatchFragment.java
@@ -232,6 +232,10 @@ public class CreatePatchFragment extends ActionFragment implements View.OnClickL
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 String newName = input.getText().toString();
+                if (newName.equals("")) {
+                    Toast.makeText(getActivity(), R.string.dialog_rename_error_empty_name, Toast.LENGTH_LONG).show();
+                    return;
+                }
                 if (newName.contains("/")) {
                     newName = newName.replaceAll("/", "_");
                     Toast.makeText(getActivity(), R.string.dialog_rename_error_invalid_chars, Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/org/emunix/unipatcher/ui/fragment/PatchingFragment.java b/app/src/main/java/org/emunix/unipatcher/ui/fragment/PatchingFragment.java
index c07942b..b486499 100644
--- a/app/src/main/java/org/emunix/unipatcher/ui/fragment/PatchingFragment.java
+++ b/app/src/main/java/org/emunix/unipatcher/ui/fragment/PatchingFragment.java
@@ -248,6 +248,10 @@ public class PatchingFragment extends ActionFragment implements View.OnClickList
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 String newName = input.getText().toString();
+                if (newName.equals("")) {
+                    Toast.makeText(getActivity(), R.string.dialog_rename_error_empty_name, Toast.LENGTH_LONG).show();
+                    return;
+                }
                 if (newName.contains("/")) {
                     newName = newName.replaceAll("/", "_");
                     Toast.makeText(getActivity(), R.string.dialog_rename_error_invalid_chars, Toast.LENGTH_LONG).show();
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3763a6f..3e78d4b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -23,6 +23,7 @@
     <string name="dialog_rename_cancel">Cancelar</string>
     <string name="dialog_rename_error_same_name">Los nombres de archivos de entrada y salida deben ser diferentes</string>
     <string name="dialog_rename_error_invalid_chars">Símbolo no válido /</string>
+    <string name="dialog_rename_error_empty_name">File name can not be empty</string>
 
     <!-- Create patch fragment -->
     <string name="create_patch_fragment_source_file">Archivo fuente</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b10c422..53715a3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -23,6 +23,7 @@
     <string name="dialog_rename_cancel">Cancella</string>
     <string name="dialog_rename_error_same_name">The input and output file names must be different</string>
     <string name="dialog_rename_error_invalid_chars">Simbolo non valido /</string>
+    <string name="dialog_rename_error_empty_name">File name can not be empty</string>
 
     <!-- Create patch fragment -->
     <string name="create_patch_fragment_source_file">Source file</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3674eb1..14c5a59 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -23,6 +23,7 @@
     <string name="dialog_rename_cancel">Anuluj</string>
     <string name="dialog_rename_error_same_name">The input and output file names must be different</string>
     <string name="dialog_rename_error_invalid_chars">Niewłaściwy symbol /</string>
+    <string name="dialog_rename_error_empty_name">File name can not be empty</string>
 
     <!-- Create patch fragment -->
     <string name="create_patch_fragment_source_file">Source file</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 129dfa9..b79c8f9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -23,6 +23,7 @@
     <string name="dialog_rename_cancel">Отмена</string>
     <string name="dialog_rename_error_same_name">Имена файлов должны отличаться</string>
     <string name="dialog_rename_error_invalid_chars">Некорректный символ /</string>
+    <string name="dialog_rename_error_empty_name">Имя файла не может быть пустым</string>
 
     <!-- Create patch fragment -->
     <string name="create_patch_fragment_source_file">Исходный файл</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index cbd05b7..4aaf821 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -23,6 +23,7 @@
     <string name="dialog_rename_cancel">Скасувати</string>
     <string name="dialog_rename_error_same_name">The input and output file names must be different</string>
     <string name="dialog_rename_error_invalid_chars">Недійсний символ /</string>
+    <string name="dialog_rename_error_empty_name">File name can not be empty</string>
 
     <!-- Create patch fragment -->
     <string name="create_patch_fragment_source_file">Source file</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 243463f..d6b6c2e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
     <string name="dialog_rename_cancel">Cancel</string>
     <string name="dialog_rename_error_same_name">The input and output file names must be different</string>
     <string name="dialog_rename_error_invalid_chars">Invalid symbol /</string>
+    <string name="dialog_rename_error_empty_name">File name can not be empty</string>
 
     <!-- Create patch fragment -->
     <string name="create_patch_fragment_source_file">Source file</string>