1 files changed, 14 insertions, 2 deletions

diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index fcecc8d64aa8..e6bef8d00af6 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -133,6 +133,7 @@ Public sCANCEL as String
 Dim sEnd as String
 
 Sub InitializeResources()
+Dim LocWorkPath as String
 	With DialogModel
 		' Strings that are also needed by the Password Dialog
 		sGoOn = GetResText(1003)
@@ -219,7 +220,15 @@ Sub InitializeResources()
  			.chkRecursive.Label = sInclusiveSubDir
 			sTARGETDIR = GetResText(1206)
  			.lblTarget.Label = STARGETDIR 
-			.txtSource.Text = ConvertfromUrl(GetPathSettings("Work"))
+			
+			LocWorkPath = GetPathSettings("Work")
+			If Not oUcb.Exists(LocWorkPath) Then
+				ShowNoOfficePathError()
+				Stop
+			End If
+
+			.txtSource.Text = ConvertfromUrl(LocWorkPath)
+			
 			SubstDir = .txtSource.Text
 			.txtTarget.Text = .txtSource.Text
 			.hlnProgress.Label = GetResText(1600)
@@ -231,7 +240,6 @@ Sub InitializeResources()
 	End With
 End Sub
 
-
 Sub InitializeLanguages()
 	sEuroSign = chr(8364)
 
@@ -448,6 +456,7 @@ Sub InitializeControls()
 	End If
 End Sub	
 
+
 Sub InitializeConverter(oLocale, iDialogPage as Integer)
 Dim Isthere as Boolean
 	bCancelProtection = False
@@ -472,6 +481,9 @@ Dim Isthere as Boolean
 	InitializeCurrencies()
 	InitializeControls()
 	BitmapDir = GetOfficeSubPath("Template", "wizard/bitmap")
+	If BitmapDir = "" Then
+		Stop
+	End If
 	FillUpCurrencyListbox()
 	DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_" & DialogModel.Step & ".bmp"	
 	DialogConvert.Title = sMsgDLGTITLE