diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
index 244cd436b3..0c4ee3c2cc 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -12,9 +12,11 @@ module Digest
     begin
       require lib
     rescue LoadError => e
-      raise LoadError, "library not found for class Digest::#{name} -- #{lib}"
+      raise LoadError, "library not found for class Digest::#{name} -- #{lib}", caller(1)
+    end
+    unless Digest.const_defined?(name)
+      raise NameError, "uninitialized constant Digest::#{name}", caller(1)
     end
-
     Digest.const_get(name)
   end
 
diff --git a/version.h b/version.h
index 0cdfbcd598..f5766ae1ea 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 79
+#define RUBY_PATCHLEVEL 80
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8