diff --git a/ChangeLog b/ChangeLog
index fbfae0122..dcdad2ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-07-26  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/gen_mod.erl: Throw error more cleanly.
+	
 	* src/mod_configure.erl: One ACL call was not virtual host
 	compliant.
 
diff --git a/src/gen_mod.erl b/src/gen_mod.erl
index 5f96a2fc6..7ba6db182 100644
--- a/src/gen_mod.erl
+++ b/src/gen_mod.erl
@@ -94,7 +94,7 @@ get_opt(Opt, Opts) ->
     case lists:keysearch(Opt, 1, Opts) of
 	false ->
  	    % TODO: replace with more appropriate function
- 	    [] = {undefined_option, Opt};
+	    throw({undefined_option, Opt});
 	{value, {_, Val}} ->
 	    Val
     end.