diff --git a/components/fpexif/fpeexifreadwrite.pas b/components/fpexif/fpeexifreadwrite.pas
index fd642350f..44b7439c6 100644
--- a/components/fpexif/fpeexifreadwrite.pas
+++ b/components/fpexif/fpeexifreadwrite.pas
@@ -339,8 +339,8 @@ begin
     // Read directory entry...
     n := SizeOf(ifdRec);
     if AStream.Read(ifdRec, n) < n then begin
-      Error(Format(rsReadIncompleteIFDRecord, [tagPos]));
-      exit;
+      Warning(Format(rsReadIncompleteIFDRecord, [tagPos]));
+      break;
     end;
 
     if (ifdRec.TagID = 0) and (ifdRec.DataType = 0) and (ifdRec.DataCount = 0) and (ifdRec.DataValue = 0) then
@@ -360,8 +360,8 @@ begin
     ifdRec.TagID := FixEndian16(ifdRec.TagID);
     ifdRec.DataType := FixEndian16(ifdRec.DataType);
     if not (ifdRec.DataType in [1..ord(High(TTagType))]) then begin
-      Error(Format(rsIncorrectTagType, [ifdRec.DataType, i, ifdRec.TagID, FImgInfo.Filename]));
-      exit;
+      Warning(Format(rsIncorrectTagType, [ifdRec.DataType, i, ifdRec.TagID, FImgInfo.Filename]));
+      break;
     end;
 
     ifdRec.DataCount := FixEndian32(ifdRec.DataCount);