===================================================================
RCS file: /cvs/palm/Palm-Keyring/lib/Palm/Keyring.pm,v
retrieving revision 1.56
retrieving revision 1.58
diff -u -r1.56 -r1.58
--- palm/Palm-Keyring/lib/Palm/Keyring.pm	2008/09/18 07:04:55	1.56
+++ palm/Palm-Keyring/lib/Palm/Keyring.pm	2008/09/19 03:50:05	1.58
@@ -1,5 +1,5 @@
 package Palm::Keyring;
-# $RedRiver: Keyring.pm,v 1.55 2008/09/17 14:47:47 andrew Exp $
+# $RedRiver: Keyring.pm,v 1.57 2008/09/19 02:04:34 andrew Exp $
 ########################################################################
 # Keyring.pm *** Perl class for Keyring for Palm OS databases.
 #
@@ -292,9 +292,6 @@
     my $self = shift;
     my $rec  = shift;
 
-    # XXX This probably shouldn't croak, just make something up
-    croak "No encrypted content to pack" if !defined $rec->{encrypted};
-
     if ($self->{version} == 4) {
         if ($rec->{encrypted}) {
             my $name = $rec->{plaintext}->{0}->{data} || $EMPTY;
@@ -302,8 +299,8 @@
         }
 
     } elsif ($self->{version} == 5) {
-        # XXX This probably shouldn't croak, just make something up
-        croak "No ivec" if !$rec->{ivec};
+        croak 'No encrypted data in record' if !defined $rec->{encrypted};
+        croak 'No ivec!' if !$rec->{ivec};
 
         my $field;
         if ($rec->{plaintext}->{0}) {
@@ -326,6 +323,8 @@
     # XXX Should I?
     delete $rec->{plaintext};
     delete $rec->{encrypted};
+
+    croak 'No data in record to pack' if !$rec->{data};
 
     return $self->SUPER::PackRecord($rec, @_);
 }