diff --git a/trash b/trash
index c3743f6..94236f5 100755
--- a/trash
+++ b/trash
@@ -24,6 +24,7 @@ interactive_flag=
 force_flag=
 [ -z "$FS" ] && FS='\t'
 [ -z "$RS" ] && RS='\n'
+set -o pipefail
 
 fail() {
   echo "$@" 1>&2
@@ -56,8 +57,8 @@ pick_trashfiles() {
   shift
   prompt="$1"
   shift
-  ls -A "$td"/info | \
-    fzf -1 --prompt="$prompt" --query="$@" --multi \
+  find "$td"/info -mindepth 1 -maxdepth 1 -print0 | \
+    fzf -1 --read0 --prompt="$prompt" --query="$@" --multi \
     --preview="sh -c 'f=\"$td/files/\${1%.trashinfo}\"; [ -d \"\$f\" ] && tree \"\$f\" || echo \"\$f\" && cat \"\$f\"' -- {}"
 }
 
@@ -157,6 +158,13 @@ DeletionDate=$(date +"%FT%H:%M:%S")
 END
 }
 
+exit_if_trash_empty() {
+  if ! [ -d "$1" ] || [ -z "$(ls -A "$1/files")" ]; then
+    echo "Nothing in the trash!"
+    exit
+  fi
+}
+
 trash_file() {
   filename=$1
   dir=${filename%/*}
@@ -205,24 +213,18 @@ untrash_files() {
 
 empty_files() {
   td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")"
-  if [ -d "$td" ] && [ -z "$(ls -A "$td/files")" ]; then
-    echo "Nothing in the trash!"
-    exit
-  fi
+  exit_if_trash_empty "$td"
   pick_trashfiles "$td" "Pick file(s) to permanently delete: " "$@" | \
     while read -r info; do
       orig="$(path_from_trashinfo "$td/info/$info")"
       rm -r $verbose_flag "$td/info/$info" "$td/files/${info%.trashinfo}" || fail "Could not remove file"
-    done
+    done || return 1
   printf '\033[1mDeleted!\033[0m\n'
 }
 
 empty_trash() {
   td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")"
-  if [ -d "$td" ] && [ -z "$(ls -A "$td/files")" ]; then
-    echo "Nothing in the trash!"
-    exit
-  fi
+  exit_if_trash_empty "$td"
   ( printf '\033[1mThe following files will be deleted:\033[0m\n' &&
     printf '  \033[33;1m%s\033[0m\n' "$td"/files/* &&
     printf '\033[1mThis will free up %s of space\033[0m\n' "$(du -h --summarize "$td/files" | cut -f1)") | more
@@ -233,10 +235,7 @@ empty_trash() {
 
 list_trash() {
   td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")"
-  if [ -d "$td" ] && [ -z "$(ls -A "$td/files")" ]; then
-    echo "Nothing in the trash!"
-    exit
-  fi
+  exit_if_trash_empty "$td"
   for f in "$td/files"/*; do
     printf '%s'"$RS"'%s'"$RS"'%s'"$FS" \
       "$f" "$(date_from_trashinfo "$td/info/$(basename "$f").trashinfo")" \