diff --git a/src/API/Std.pm b/src/API/Std.pm
index 90c01b7..eee0ac6 100644
--- a/src/API/Std.pm
+++ b/src/API/Std.pm
@@ -139,12 +139,7 @@ sub event_run
 	
 	if (defined $EVENTS{lc($event)} and defined $HOOKS{lc($event)}) {
 		foreach my $hk (keys %{ $HOOKS{lc($event)} }) {
-			if (defined @args) {
-				&{ $HOOKS{lc($event)}{$hk} }(@args);
-			}
-			else {
-				&{ $HOOKS{lc($event)}{$hk} }();
-			}
+			&{ $HOOKS{lc($event)}{$hk} }(@args);
 		}
 	}
 	
diff --git a/src/Parser/IRC.pm b/src/Parser/IRC.pm
index 1371367..091936e 100644
--- a/src/Parser/IRC.pm
+++ b/src/Parser/IRC.pm
@@ -181,7 +181,7 @@ sub num475
 
 # Parse: Numeric:477
 # Cannot join channel: Need registered nickname.
-sub num473
+sub num477
 {
 	my ($svr, (undef, undef, undef, $chan)) = @_;