diff --git a/tests/enquirytests.rb b/tests/enquirytests.rb
index d78cb82..462b1ae 100644
--- a/tests/enquirytests.rb
+++ b/tests/enquirytests.rb
@@ -607,13 +607,13 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.button(:value, 'Login').click        
     @@ie.wait
     #check we've got the login page
-    assert(@@ie.text_field(:id,'P101_USERNAME').exists?,'Could not find P101_USERNAME field')     
-    assert(@@ie.text_field(:id,'P101_PASSWORD').exists?,'Could not find P101_PASSWORD field')
-    assert(@@ie.button(:id, 'login').exists?,'Could not find a Login button')
+    assert(@@ie.text_field(:id,'P101_USERNAME').exists?,'Could not find P101_USERNAME field '+geterrormess(@@ie))     
+    assert(@@ie.text_field(:id,'P101_PASSWORD').exists?,'Could not find P101_PASSWORD field '+geterrormess(@@ie))
+    assert(@@ie.button(:id, 'login').exists?,'Could not find a Login button '+geterrormess(@@ie))
     login(AGENT, AGENT_PWD)
     menu('Enquiries')
     menu('Create Enquiry')
-    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear')
+    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear '+geterrormess(@@ie))
     #check the regions appear
     assert(@@ie.contains_text('Site Detail'),'Site Detail region not found')
     assert(@@ie.contains_text('Site Address'),'The Site Address region not found')
@@ -693,8 +693,8 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.button(:value, 'Login').click        
     @@ie.wait
     #check we've got the login page
-    assert(@@ie.text_field(:id,'P101_USERNAME').exists?,'Could not find P101_USERNAME field')     
-    assert(@@ie.text_field(:id,'P101_PASSWORD').exists?,'Could not find P101_PASSWORD field')
+    assert(@@ie.text_field(:id,'P101_USERNAME').exists?,'Could not find P101_USERNAME field '+geterrormess(@@ie))     
+    assert(@@ie.text_field(:id,'P101_PASSWORD').exists?,'Could not find P101_PASSWORD field '+geterrormess(@@ie))
     assert(@@ie.button(:id, 'login').exists?,'Could not find a Login button')
     login(CS, CS_PWD)
     menu('Enquiries')
@@ -709,8 +709,8 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.button(:value, 'Login').click        
     @@ie.wait
     #check we've got the login page to enter data into
-    assert(@@ie.text_field(:id,'P101_USERNAME').exists?,'Could not find P101_USERNAME field')     
-    assert(@@ie.text_field(:id,'P101_PASSWORD').exists?,'Could not find P101_PASSWORD field')
+    assert(@@ie.text_field(:id,'P101_USERNAME').exists?,'Could not find P101_USERNAME field '+geterrormess(@@ie))     
+    assert(@@ie.text_field(:id,'P101_PASSWORD').exists?,'Could not find P101_PASSWORD field '+geterrormess(@@ie))
     assert(@@ie.button(:id, 'login').exists?,'Could not find a Login button')
     login(SA, SA_PWD)
     menu('Enquiries')
@@ -767,7 +767,7 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.text_field(:id,'P32_FIRST_CONTACT_EMAIL').set 'jamie.priest@advanticagroup.com'
     @@ie.button(:value, 'Save').click
     @@ie.wait
-    assert_nil(@@ie.contains_text('Error'),'Error found')    
+    assert_nil(@@ie.contains_text('Error'),'Error found '+geterrormess(@@ie))    
     assert_equal(false,@@ie.button(:value, 'Save').exists?,'Found Save button when it should have been hidden')
     assert(@@ie.button(:value, 'Apply Changes').exists?,'Could not find an Apply Changes button')    
     assert(@@ie.button(:value, 'Cancel').exists?,'Could not find a Cancel button')  
@@ -820,8 +820,8 @@ class Test_02_enquiry < Test::Unit::TestCase
     assert_nil(@@ie.contains_text('Error'),'Error found >'+geterrormess(@@ie))
     @@ie.button(:value, 'Request Quotation').click    
     @@ie.wait
-    assert_nil(@@ie.contains_text('Error'),'Error found')
-    assert_nil(@@ie.contains_text('error'),'Error found')  
+    assert_nil(@@ie.contains_text('Error'),'Error found '+geterrormess(@@ie))
+    assert_nil(@@ie.contains_text('error'),'Error found '+geterrormess(@@ie))  
   end  
 
   def test_24_find_saved_quote
@@ -841,11 +841,11 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.text_field(:id,'P30_ENQUIRY_ID').set @@savedenquiryid 
     @@ie.button(:value, 'Search').click
     @@ie.wait
-    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found')
+    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found '+geterrormess(@@ie))
     assert(@@ie.link(:name,'View_enquiry_'+@@savedenquiryid).exists?,'Could not find link to Enquiry '+@@savedenquiryid)
     @@ie.link(:name,'View_enquiry_'+@@savedenquiryid).click
     @@ie.wait
-    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear')
+    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear '+geterrormess(@@ie))
     #check the regions appear
     assert(@@ie.contains_text('Site Detail'),'Site Detail region not found')
     assert(@@ie.contains_text('Site Address'),'The Site Address region not found')
@@ -862,7 +862,7 @@ class Test_02_enquiry < Test::Unit::TestCase
     login(MIPADMIN, MIPADMIN_PWD)
     menu('Enquiries')
     menu('Create Enquiry')
-    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear')
+    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear '+geterrormess(@@ie))
     #check the regions appear
     assert(@@ie.contains_text('Site Detail'),'Site Detail region not found')
     assert(@@ie.contains_text('Site Address'),'The Site Address region not found')
@@ -902,25 +902,25 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.text_field(:id,'P32_FIRST_CONTACT_EMAIL').set 'jamie.priest@advanticagroup.com'    
     @@ie.button(:value, 'Save').click
     @@ie.wait
-    assert_nil(@@ie.contains_text('Error'),'Error found') 
+    assert_nil(@@ie.contains_text('Error'),'Error found '+geterrormess(@@ie)) 
     assert(@@ie.button(:value, 'Apply Changes').exists?,'Could not find a Save button')         
     assert(@@ie.button(:value, 'Upload File').exists?,'Could not find a Save button')         
     @@ie.button(:value, 'Upload File').click
     @@ie.wait
     #check the regions appear
-    assert(@@ie.contains_text('Current Files'),'Current Files region not found')
-    assert(@@ie.contains_text('Upload File'),'Upload File region not found')
+    assert(@@ie.contains_text('Current Files'),'Current Files region not found '+geterrormess(@@ie))
+    assert(@@ie.contains_text('Upload File'),'Upload File region not found '+geterrormess(@@ie))
     #we know InstallMIP.cmd is around
     @@ie.file_field(:id, 'P41_FILE_UPLOAD').set(WORKINGDIR+'\\InstallMIP.cmd')
     @@ie.button(:value, 'Upload').click
     @@ie.wait
-    assert(@@ie.contains_text('File for enquiry uploaded'),'Upload success message not found')
+    assert(@@ie.contains_text('File for enquiry uploaded'),'Upload success message not found '+geterrormess(@@ie))
     assert(@@ie.button(:value, 'Delete File').exists?,'Could not find a Delete File button')         
     @@ie.button(:value, 'Delete File').click
     @@ie.wait
     #check the regions appear
-    assert(@@ie.contains_text('Current Files'),'Current Files region not found')
-    assert(@@ie.contains_text('Upload File'),'Upload File region not found')
+    assert(@@ie.contains_text('Current Files'),'Current Files region not found '+geterrormess(@@ie))
+    assert(@@ie.contains_text('Upload File'),'Upload File region not found '+geterrormess(@@ie))
     #Due to the Antivirus checking the file may not yet be ready for deleting 
     #so I've remove the assertion below
     #assert(@@ie.link(:text,'Delete').exists?,'Could not find a Delete link')         
@@ -934,7 +934,7 @@ class Test_02_enquiry < Test::Unit::TestCase
     login(MIPADMIN, MIPADMIN_PWD)
     menu('Enquiries')
     menu('Create Enquiry')
-    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear')
+    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear '+geterrormess(@@ie))
     #check the regions appear
     assert(@@ie.contains_text('Site Detail'),'Site Detail region not found')
     assert(@@ie.contains_text('Site Address'),'The Site Address region not found')
@@ -974,7 +974,7 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.text_field(:id,'P32_FIRST_CONTACT_EMAIL').set 'jamie.priest@advanticagroup.com'    
     @@ie.button(:value, 'Save').click
     @@ie.wait
-    assert_nil(@@ie.contains_text('Error'),'Error found') 
+    assert_nil(@@ie.contains_text('Error'),'Error found '+geterrormess(@@ie)) 
     assert(@@ie.button(:value, 'Apply Changes').exists?,'Could not find a Save button')         
     assert(@@ie.button(:value, 'Upload File').exists?,'Could not find a Save button')         
 
@@ -1023,7 +1023,7 @@ class Test_02_enquiry < Test::Unit::TestCase
     #@@ie.text_field(:id,'P32_EXISTING_CONVERTOR').set ''
     @@ie.button(:value, 'Request Quotation').click    
     @@ie.wait
-    assert_nil(@@ie.contains_text('Error'),'Error found')
+    assert_nil(@@ie.contains_text('Error'),'Error found '+geterrormess(@@ie))
     menu('Enquiries')
     menu('Search for Enquiry')
     assert(@@ie.contains_text('Search Enquiries'),'Search Enquiries region not found')
@@ -1035,11 +1035,11 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.text_field(:id,'P30_ENQUIRY_ID').set @@savedenquiryid 
     @@ie.button(:value, 'Search').click
     @@ie.wait
-    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found')
+    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found '+geterrormess(@@ie))
     assert(@@ie.link(:name,'View_enquiry_'+@@savedenquiryid).exists?,'Could not find link to Enquiry '+@@savedenquiryid)
     @@ie.link(:name,'View_enquiry_'+@@savedenquiryid).click
     @@ie.wait
-    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear')
+    assert(@@ie.contains_text('Enquiry'),'The Enquiry screen did not appear '+geterrormess(@@ie))
     #check the regions appear
     assert(@@ie.contains_text('Site Detail'),'Site Detail region not found')
     assert(@@ie.contains_text('Site Address'),'The Site Address region not found')
@@ -1054,19 +1054,19 @@ class Test_02_enquiry < Test::Unit::TestCase
     @@ie.file_field(:id, 'P41_FILE_UPLOAD').set(WORKINGDIR+'\\InstallMIP.cmd')
     @@ie.button(:value, 'Upload').click    
     @@ie.wait
-    assert_nil(@@ie.contains_text('Error'),'Error found')
+    assert_nil(@@ie.contains_text('Error'),'Error found '+geterrormess(@@ie))
     menu('Enquiries')
     menu('Search for Enquiry')
     @@ie.text_field(:id,'P30_ENQUIRY_ID').set @@savedenquiryid 
     @@ie.button(:value, 'Search').click
     @@ie.wait
-    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found')
+    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found '+geterrormess(@@ie))
     assert(@@ie.link(:name,'View_enquiry_'+@@savedenquiryid).exists?,'Could not find link to Enquiry '+@@savedenquiryid)
     @@ie.link(:name,'View_quote_'+@@savedenquiryid).click
     @@ie.wait
-    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found')
-    assert(@@ie.contains_text('Manual Quote'),'Manual Quote Region not found')
-    assert(@@ie.link(:text,'View PDF').exists?,'Could not find link to manual quote file')      
+    assert(@@ie.contains_text(@@savedenquiryid),' Enquiry '+@@savedenquiryid+' not found '+geterrormess(@@ie))
+    assert(@@ie.contains_text('Manual Quote'),'Manual Quote Region not found '+geterrormess(@@ie))
+    assert(@@ie.link(:text,'View PDF').exists?,'Could not find link to manual quote file '+geterrormess(@@ie))      
   end
 #Check asterisk on correct fields
 #Amend an existing enquiry
@@ -1076,7 +1076,7 @@ class Test_02_enquiry < Test::Unit::TestCase
 
   def test_50_logout
     menu('Logout')
-    assert(@@ie.button(:value, 'Login').exists?,'The Login button was not available')        
+    assert(@@ie.button(:value, 'Login').exists?,'The Login button was not available '+geterrormess(@@ie))        
     @@ie.button(:value, 'Login').click        
     @@ie.wait
   end