--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/05 13:55:21	1.15
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/11 06:54:10	1.16
@@ -1,8 +1,11 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.15 2002/12/05 13:55:21 joko Exp $
+#  $Id: Tangram.pm,v 1.16 2002/12/11 06:54:10 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  Revision 1.16  2002/12/11 06:54:10  joko
+#  + fix: encapsulated object-loading inside an 'eval'
+#
 #  Revision 1.15  2002/12/05 13:55:21  joko
 #  + now utilizing 'object2hash' instead of 'var_deref'
 #  + played around with having fresh-objects - no progress....
@@ -497,12 +500,19 @@
   my $self = shift;
   my $oid = shift;
   my $options = shift;
-  # TODO: create a deep_unload method
+
+  # TODO: create a deep_unload method (currently _all_ objects are unloaded)
   # unload($oid) will only unload object, not deep object hashes
   $self->{_COREHANDLE}->unload() if($options->{destroy});
+
   # TODO: review this
   #if (!$self->{COREHANDLE}) { return; }
-  return $self->{_COREHANDLE}->load($oid);
+
+  # TODO: review this
+  my $object = eval('$self->{_COREHANDLE}->load($oid);');
+  print $@, "\n" if $@;
+
+  return $object if $object;
 }
 
 sub getObjectAsHash {