--- oup/current/Tools/RawEdit.pas	2007/06/18 14:20:33	221
+++ oup/current/Tools/RawEdit.pas	2007/06/18 14:23:58	223
@@ -145,11 +145,19 @@ begin
 
   rawinfo := ConManager.Connection[ConnectionID].GetRawInfo(fileid, datoffset);
 
-  mem := nil;
-  ConManager.Connection[ConnectionID].LoadRawFile(rawinfo.SrcID, rawinfo.SrcOffset, TStream(mem));
-  hex.LoadFromStream(mem);
-  ClearValues;
-  hexSelectionChanged(Self);
+  if rawinfo.RawSize > 0 then
+  begin
+    mem := nil;
+    ConManager.Connection[ConnectionID].LoadRawFile(rawinfo.SrcID, rawinfo.SrcOffset, TStream(mem));
+    hex.LoadFromStream(mem);
+    ClearValues;
+    hexSelectionChanged(Self);
+  end
+  else
+  begin
+    hex.DataSize := 0;
+    ClearValues;
+  end;
 end;