diff --git a/generators/wiki/cpu_parameters.rb b/generators/wiki/cpu_parameters.rb
index cc5624b840ea33d9214974832c819e2dc58b7867..441cad5cf875f6fc30dbb923506899934cf0513a 100644
--- a/generators/wiki/cpu_parameters.rb
+++ b/generators/wiki/cpu_parameters.rb
@@ -63,5 +63,16 @@ generator = CPUParametersGenerator.new("Generated/CPUParameters")
 
 options = WikiGenerator::parse_options
 if (options)
-  exit(WikiGenerator::exec(generator, options))
+  ret = 2
+  begin
+    ret = WikiGenerator::exec(generator, options)
+  rescue MediawikiApi::ApiError => e
+    puts e, e.backtrace
+    ret = 3
+  rescue StandardError => e
+    puts e, e.backtrace
+    ret = 4
+  ensure
+    exit(ret)
+  end
 end
diff --git a/generators/wiki/disk_reservation.rb b/generators/wiki/disk_reservation.rb
index ea1b9cadc025140d785d66b1be0cfc44c001a55d..6110517af2889abc6e8944cd3ff397388a1653c8 100644
--- a/generators/wiki/disk_reservation.rb
+++ b/generators/wiki/disk_reservation.rb
@@ -67,5 +67,16 @@ generator = DiskReservationGenerator.new("Generated/DiskReservation")
 
 options = WikiGenerator::parse_options
 if (options)
-  exit(WikiGenerator::exec(generator, options))
+  ret = 2
+  begin
+    ret = WikiGenerator::exec(generator, options)
+  rescue MediawikiApi::ApiError => e
+    puts e, e.backtrace
+    ret = 3
+  rescue StandardError => e
+    puts e, e.backtrace
+    ret = 4
+  ensure
+    exit(ret)
+  end
 end
diff --git a/generators/wiki/hardware.rb b/generators/wiki/hardware.rb
index d495c1bb11c8f598ad7d9cd1f512927ff1e3839a..0faeee7c6a585d984d2eeceff42e4f422f670afe 100644
--- a/generators/wiki/hardware.rb
+++ b/generators/wiki/hardware.rb
@@ -275,10 +275,13 @@ if (options)
   ret = 2
   begin
     ret = WikiGenerator::exec(generator, options)
+  rescue MediawikiApi::ApiError => e
+    puts e, e.backtrace
+    ret = 3
   rescue StandardError => e
     puts "Error with node: #{generator.instance_variable_get(:@node)}"
     puts e, e.backtrace
-    ret = 3
+    ret = 4
   ensure
     exit(ret)
   end
diff --git a/generators/wiki/oar_properties.rb b/generators/wiki/oar_properties.rb
index 31e2218764b5a3b7a1dd9dc6f7effc1b45f746c4..6b8ed78caa8847a7ccc898cb17a824788d3bb40e 100644
--- a/generators/wiki/oar_properties.rb
+++ b/generators/wiki/oar_properties.rb
@@ -228,6 +228,17 @@ generator = OarPropertiesGenerator.new("Generated/OAR_Properties")
 
 options = WikiGenerator::parse_options
 if (options)
-  exit(WikiGenerator::exec(generator, options))
+  ret = 2
+  begin
+    ret = WikiGenerator::exec(generator, options)
+  rescue MediawikiApi::ApiError => e
+    puts e, e.backtrace
+    ret = 3
+  rescue StandardError => e
+    puts e, e.backtrace
+    ret = 4
+  ensure
+    exit(ret)
+  end
 end
 
diff --git a/generators/wiki/site_hardware.rb b/generators/wiki/site_hardware.rb
index 80be6d9e53f885400701399c019cb73e28bc9f36..e8d1f9be022b4ae5d7897a0243c81d23bf351b19 100644
--- a/generators/wiki/site_hardware.rb
+++ b/generators/wiki/site_hardware.rb
@@ -252,11 +252,21 @@ if __FILE__ == $0
   options = WikiGenerator::parse_options
 
   if (options)
-    ret = true
-    generators = options[:sites].map{ |site| SiteHardwareGenerator.new(site.capitalize + ':Hardware', site) }
-    generators.each{ |generator|
-      ret &= WikiGenerator::exec(generator, options)
-    }
-    exit(ret)
+    ret=2
+    begin
+      ret = true
+      generators = options[:sites].map{ |site| SiteHardwareGenerator.new(site.capitalize + ':Hardware', site) }
+      generators.each{ |generator|
+        ret &= WikiGenerator::exec(generator, options)
+      }
+    rescue MediawikiApi::ApiError => e
+      puts e, e.backtrace
+      ret = 3
+    rescue StandardError => e
+      puts e, e.backtrace
+      ret = 4
+    ensure
+      exit(ret)
+    end
   end
 end
diff --git a/generators/wiki/site_network.rb b/generators/wiki/site_network.rb
index 27d2016fa0c2646977a5f4d74c4c3e348d238d7b..3ccf2355beab3b6b8f3c55b4de7de2f1e9fe139d 100644
--- a/generators/wiki/site_network.rb
+++ b/generators/wiki/site_network.rb
@@ -35,10 +35,20 @@ end
 options = WikiGenerator::parse_options
 
 if (options)
-  ret = true
-  generators = options[:sites].map{ |site| SiteNetworkGenerator.new('Generated/' + site.capitalize + 'Network', site) }
-  generators.each{ |generator|
-     ret &= WikiGenerator::exec(generator, options)
-  }
-  exit(ret)
+  ret = 2
+  begin
+    ret = true
+    generators = options[:sites].map{ |site| SiteNetworkGenerator.new('Generated/' + site.capitalize + 'Network', site) }
+    generators.each{ |generator|
+      ret &= WikiGenerator::exec(generator, options)
+    }
+  rescue MediawikiApi::ApiError => e
+    puts e, e.backtrace
+    ret = 3
+  rescue StandardError => e
+    puts e, e.backtrace
+    ret = 4
+  ensure
+    exit(ret)
+  end
 end