diff --git a/9gag/__init__.py b/9gag/__init__.py
deleted file mode 100644
index e4b9411..0000000
--- a/9gag/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from pipobot.lib.modules import SyncModule, defaultcmd
-from pipobot.lib.utils import check_url
-
-
-class Gags(SyncModule):
-    def __init__(self, bot):
-        desc = _('retrieves a random 9gag page.')
-        SyncModule.__init__(self,
-                                 bot,
-                                 desc=desc,
-                                 name="9gag")
-
-    @defaultcmd
-    def answer(self, sender, message):
-        return check_url('http://9gag.com/random', geturl=True)
diff --git a/link/__init__.py b/link/__init__.py
index 4dc64c0..eddfb91 100644
--- a/link/__init__.py
+++ b/link/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-import os
 import ConfigParser
+import os
+
 from pipobot.lib.modules import MultiSyncModule, defaultcmd
 from pipobot.lib.utils import check_url
 
@@ -32,6 +33,10 @@ def readconf(self, bot):
 
     @defaultcmd
     def answer(self, cmd, sender, message):
+        url = self.dico[cmd]['url']
         if message:
-            return check_url(self.dico[cmd]['url'].replace('KEYWORDS', message).replace(' ', '+').encode('utf-8'), geturl=True)
-        return "rtfm ;)"
+            if 'KEYWORDS' in url:
+                url = url.replace('KEYWORDS', message).replace(' ', '+')
+            else:
+                return _("This command does not take arguments")
+        return check_url(url.encode('utf-8'), geturl=True)
diff --git a/link/urllist.cfg b/link/urllist.cfg
index 94efc59..303590b 100644
--- a/link/urllist.cfg
+++ b/link/urllist.cfg
@@ -25,3 +25,7 @@ url: http://www.downforeveryoneorjustme.com/KEYWORDS
 [github]
 desc: github's advanced search
 url: https://github.com/search?q=KEYWORDS
+
+[9gag]
+desc: 9gag random page
+url: http://9gag.com/random