diff --git a/source/modules/rolechooser.rb b/source/modules/rolechooser.rb
index 3551aa6..f633bf8 100644
--- a/source/modules/rolechooser.rb
+++ b/source/modules/rolechooser.rb
@@ -4,9 +4,11 @@ class Mod_RoleChooser < Vrobot4::Module::Module
 
    def initialize info
       super
+
       register :c_addvrole, "addvroles", "Adds another vanity role to you."
       register :c_delvrole, "delvroles", "Removes a vanity role from you."
       register :c_listvroles, "listvroles", "Lists available vanity roles."
+
       @info.map! do |id| id.resolve_id end
    end
 
@@ -32,7 +34,7 @@ class Mod_RoleChooser < Vrobot4::Module::Module
    def c_listvroles m, argv
       text = ""
       for role in @info do
-         text << m.chan.real.server.role(role).name + "\n"
+         text << m.chan.real.server.role(role).name + ?\n
       end
       m.reply text
    end
diff --git a/source/server.rb b/source/server.rb
index 714b37b..ac55a0c 100644
--- a/source/server.rb
+++ b/source/server.rb
@@ -76,6 +76,9 @@ module Vrobot4::Server
       # @return [void]
       def load_mod mod
          mt = Vrobot4::Module.get_module_type(mod)
+         if mt == nil
+            raise ArgumentError, "No such module #{mod} exists"
+         end
          if mt[:server]    and mt[:server]    != self.class.type or
             mt[:servflags] and mt[:servflags] !~ flags then
             raise ArgumentError, "Module #{mod} is not valid for this server"