2 files changed, 7 insertions, 4 deletions
diff --git a/Spline/Socketmap.pm b/Spline/Socketmap.pm
index 6633525..20c8078 100644
--- a/Spline/Socketmap.pm
+++ b/Spline/Socketmap.pm
@@ -11,9 +11,11 @@ our @EXPORT_OK = qw( );
 our $timeout = 10;
 our $handler = undef; 
 
-sub call_handler(@) {
-    return unless ref($handler) eq 'CODE';
-    return \&$handler(@_);
+
+sub call_handler($@) {
+    die 'No handler configured' unless ref($handler) eq 'CODE';
+
+    return &$handler(@_);
 }
 
 sub handle_request($) {
diff --git a/srs b/srs
index d3b6d66..0c7a203 100755
--- a/srs
+++ b/srs
@@ -9,6 +9,7 @@ use Spline::Srs;
  
 $Spline::Socketmap::timeout = 10;
 $Spline::Socketmap::handler = sub {
-    Spline::Srs->handle(@_);
+    my ($map, $key) = @_;
+    Spline::Srs::handle($map, $key);
 };
 Spline::Socketmap->run();