--- a/pkiutilities/PKCS12/CrBer/Src/Crberset.cpp	Tue Feb 02 00:44:34 2010 +0200
+++ b/pkiutilities/PKCS12/CrBer/Src/Crberset.cpp	Fri Feb 19 23:42:03 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2000, 2004 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2000, 2004, 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -817,8 +817,8 @@
             {
             handleThisTime = left;
             }
-        aData->Read(handled, ptr, handleThisTime);
-        iTarget->Write(ptr);
+        User::LeaveIfError( aData->Read(handled, ptr, handleThisTime) );
+        User::LeaveIfError( iTarget->Write(ptr) );
         ptr.Zero();
 
         handled = handled + handleThisTime;