diff --git a/modules/fortune/fortune.sh b/modules/fortune/fortune.sh
index 0b1d131..82c88d2 100755
--- a/modules/fortune/fortune.sh
+++ b/modules/fortune/fortune.sh
@@ -1,14 +1,12 @@
 [ -f functions.sh ] && source functions.sh
 
-unset fortune
-unset target
 fortune="$(command -v fortune)"
-if [ $# -ge 2 ]; then
-target="$3"
-fi
+target="${3#fortune}"
 
 if [ -z "$fortune" ]; then
 msg "$2" "I do not have access to fortune."
 else
-msg "$2" "$($fortune -aesn 512  $target | tr '[:space:]' ' ' | sed -e 's/"/\"/g')"
+fortuneText="$($fortune -a -e -s -n 512 $target || echo "No fortunes found.")"
+fortuneText="$(echo "$fortuneText" | tr '[:space:]' ' ' | sed -e 's/"/\"/g')"
+msg "$2" "$fortuneText"
 fi