3 files changed, 11 insertions, 8 deletions

diff --git a/dinobot.rb b/dinobot.rb
index 01b9735..01eeeab 100644
--- a/dinobot.rb
+++ b/dinobot.rb
@@ -46,7 +46,8 @@ module Dinobot
 
         begin
           parse_line(str)
-        rescue
+        rescue => e
+          puts "== Error parsing line. (#{e})"
         end
       end
 
@@ -111,17 +112,15 @@ module Dinobot
       mod = mod.downcase.intern
       puts "== Loading module: #{mod}"
 
-      file = "#{mod}.rb"
-
       begin
-        load file
+        load "#{mod}.rb"
 
         m = Dinobot.const_get(Dinobot.constants.find { |x| x.downcase == mod })
         @modules[mod] = m.new
 
         puts "== Loaded module: #{mod} (#{m})"
       rescue LoadError, StandardError => e
-        puts "== Failed to load module: #{mod} (#{e.message})"
+        puts "== Failed to load module: #{mod} (#{e})"
       end
     end
 
diff --git a/example.rb b/example.rb
index c161af5..fe2b0ef 100644
--- a/example.rb
+++ b/example.rb
@@ -5,7 +5,7 @@ require_relative 'dinobot'
 bot = Dinobot::Bot.new('irc.example.org', 6667, 'dinobot') do
   join '#dinobot'
 
-  load_module :echo
+  load_module :test
 end
 
 loop do
diff --git a/echo.rb b/test.rb
index 34b9770..f2010a0 100644
--- a/echo.rb
+++ b/test.rb
@@ -1,15 +1,19 @@
 require_relative 'module'
 
 module Dinobot
-  class Echo < Module
+  class Test < Module
     def initialize
       super
 
-      @commands << :echo
+      @commands << :echo << :error
     end
 
     def echo(user, channel, argument)
       [[:say, channel, argument]]
     end
+
+    def error(user, channel, argument)
+      x
+    end
   end
 end