diff --git a/frontend/msSmash.pas b/frontend/msSmash.pas
index b9f5b48..34786a0 100644
--- a/frontend/msSmash.pas
+++ b/frontend/msSmash.pas
@@ -295,7 +295,7 @@ procedure SmashRecords(var patch: TPatch; var records: TInterfaceList);
         Tracker.Write(Format('  [%d] Copying record %s', [i + 1, e.Name]));
         eCopy := wbCopyElementToFile(e, patchFile, false, true, '', '' ,'');
         patchRec := eCopy as IwbMainRecord;
-        continue;
+        if bForce then continue;
       except
         on x: Exception do begin
           Tracker.Write('      Exception copying record '+ovr.Name+' : '+x.Message);
@@ -314,7 +314,7 @@ procedure SmashRecords(var patch: TPatch; var records: TInterfaceList);
         bDeletions := recObj.I['d'] = 1;
         bOverride := recObj.I['o'] = 1;
         if bForce then
-          mst := e
+          mst := e as IwbMainRecord
         else
           mst := WinningOverrideInFiles(rec, plugin.masters);
         Tracker.Write(Format('    Smashing override from: %s, master: %s',