deal with environment being empty

Framework/PythonInterface/plugins/algorithms/SetSampleFromLogs.py

@@ -166,18 +166,17 @@ class SetSampleFromLogs(DistributedDataProcessorAlgorithm):
         environment = self._createEnvironment(runObject, instrEnum)
 
         # let SetSample generate errors if anything is wrong
-        try:
+        if self.getProperty("Environment").value.values():
+            SetSample(InputWorkspace=wksp,
+                      Material=material,
+                      Geometry=geometry)
+        else:
             SetSample(InputWorkspace=wksp,
                       Material=material,
                       Geometry=geometry,
                       Environment=environment,
                       ContainerGeometry=geometryContainer,
                       ContainerMaterial=materialContainer)
-        except Exception as inst:
-            self.log().warning(inst.args[0])
-            SetSample(InputWorkspace=wksp,
-                      Material=material,
-                      Geometry=geometry)
 
 
 # Register algorithm with Mantid.