diff -r cd501b96611d -r ece3df019add cryptoservices/filebasedcertificateandkeystores/test/certtool/certtool_remove.cpp
--- a/cryptoservices/filebasedcertificateandkeystores/test/certtool/certtool_remove.cpp	Fri Nov 06 13:21:00 2009 +0200
+++ b/cryptoservices/filebasedcertificateandkeystores/test/certtool/certtool_remove.cpp	Tue Nov 24 09:06:03 2009 +0200
@@ -79,8 +79,12 @@
 			break;
 		case EFinished:
 			{
-			// We are done!
-			iController->DisplayLocalisedMsgL(R_CERTTOOL_ERR_REMOVE_SUCCESS);			
+
+			User::LeaveIfError(iStatus.Int());
+
+		     // We are done!
+		    iController->DisplayLocalisedMsgL(R_CERTTOOL_ERR_REMOVE_SUCCESS);   
+			 		
 			CActiveScheduler::Stop();
 			}
 			break;
@@ -91,3 +95,24 @@
 		}
 	}
 
+TInt CCertToolRemove::RunError(TInt aError)
+    {
+    CActiveScheduler::Stop();
+
+    switch (aError)
+        {
+        case KErrNotFound :
+            {
+            TRAP_IGNORE(iController->DisplayLocalisedMsgL(R_CERTTOOL_ERR_NOTFOUND));         
+            }
+            break;
+        default:
+            {
+            TRAP_IGNORE(iController->DisplayLocalisedMsgL(R_CERTTOOL_ERR_REMOVE_FAILURE, aError));                
+            }
+        }   
+
+	TRAP_IGNORE(iController->DisplayErrorL(_L("\n"), iParams->iPageWise));  
+    return KErrNone;        
+    }
+