# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1272391862 18000
# Node ID e195ff3f43bf8c6e95199e1f610dc28e3daa0845
# Parent  a672cbed30148afa80b30f3d2913ca2f6f9fd89a# Parent  012040f34296f3d18dd1b08b92a555b1bf8b2097
Merge commit

diff -r 012040f34296 -r e195ff3f43bf core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/BSFPlatform.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/BSFPlatform.java	Tue Apr 27 12:04:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/BSFPlatform.java	Tue Apr 27 13:11:02 2010 -0500
@@ -225,13 +225,14 @@
 			 * @see com.nokia.carbide.cpp.epoc.engine.IViewRunnable#failedLoad(org.eclipse.core.runtime.CoreException)
 			 */
 			public Object failedLoad(CoreException exception) {
-				EpocEnginePlugin.log(exception);
+				if (exception != null)
+					EpocEnginePlugin.log(exception);
 				messages.add(new Message(IMessage.ERROR,
 						new MessageLocation(bsfPath),
 						"BSFCatalog.BSFLoadError", //$NON-NLS-1$
 						MessageFormat.format(
 								Messages.getString("BSFCatalog.BSFLoadError"), //$NON-NLS-1$
-								new Object[] { exception.getLocalizedMessage() })
+								new Object[] { exception != null ? exception.getLocalizedMessage() : "file not found" }) //$NON-NLS-1$
 				));
 				return null;
 			}
diff -r 012040f34296 -r e195ff3f43bf core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBVPlatform.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBVPlatform.java	Tue Apr 27 12:04:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBVPlatform.java	Tue Apr 27 13:11:02 2010 -0500
@@ -159,13 +159,14 @@
 			 * @see com.nokia.carbide.cpp.epoc.engine.IViewRunnable#failedLoad(org.eclipse.core.runtime.CoreException)
 			 */
 			public Object failedLoad(CoreException exception) {
-				EpocEnginePlugin.log(exception);
+				if (exception != null)
+					EpocEnginePlugin.log(exception);
 				messages.add(new Message(IMessage.ERROR,
 						new MessageLocation(sbvPath),
 						"SBVCatalog.SBVLoadError", //$NON-NLS-1$
 						MessageFormat.format(
 								Messages.getString("SBVCatalog.SBVLoadError"), //$NON-NLS-1$
-								new Object[] { exception.getLocalizedMessage() })
+								new Object[] { exception != null ? exception.getLocalizedMessage() : "file not found"  }) //$NON-NLS-1$
 				));
 				return null;
 			}