diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index fd347176..703719ec 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -216,6 +216,9 @@ Variadic variant of @option{-F}, meaning that all arguments added after this one
 will parsed as an argument to this option. Additionally, those options are added
 to @option{-F}.
 
+An important feature of this options, is that you can but it in the end of the
+command line, without any argument to get a random non-MLP:FiM pony.
+
 @item --q [PONY...]
 @itemx --quotes [PONY...]
 @opindex @option{--q}
diff --git a/ponysay.py b/ponysay.py
index de6997a3..51f8c72c 100755
--- a/ponysay.py
+++ b/ponysay.py
@@ -319,13 +319,13 @@ class Ponysay():
                         ponies[pony] = ponydir + ponyfile
         
         ## Support for explicit pony file names
-        if not names == None:
+        if names is not None:
             for name in names:
                 if os.path.exists(name):
                     ponies[name] = name
         
         ## If there is not select ponies, choose all of them
-        if names == None:
+        if (names is None) or (len(names) == 0):
             names = list(ponies.keys())
         
         ## Select a random pony of the choosen onles