diff --git a/ponysay b/ponysay
index 401c5223..e9e6141a 100755
--- a/ponysay
+++ b/ponysay
@@ -7,7 +7,7 @@ function ponyf() {
     if [[ -f ${ponydir}/${1}.cow ]] ; then
         cowsay -f "${ponydir}/${1}.cow" $@
     else
-        ponyr
+        ponyr $@
     fi
 }
 function ponyr() {
@@ -20,6 +20,7 @@ do
 	v)  echo "v0.01" ; exit;;
 	h)  echo "helpherpderp" ; exit;;
 	f)  ponyf $* ; exit;;
+	\?) echo "DERP"; exit;;
 	*)  ponyr $* ; exit;;
     esac
 done