diff --git a/oarstats.py b/oarstats.py
index 065161b5e1a506dca494bfb16bf93b36eb85588c..bc19599f8580ec658b41da32dec335bffa2ed21e 100755
--- a/oarstats.py
+++ b/oarstats.py
@@ -95,7 +95,7 @@ def main():
     args = argparser()
 
     stats_output = subprocess.check_output(["oarstat", "--yaml"]).decode('utf-8')
-    stats_yaml = yaml.load(stats_output)
+    stats_yaml = yaml.safe_load(stats_output)
 
     owners = {}
     resources_pattern = re.compile('R=([0-9]+)')
@@ -110,7 +110,10 @@ def main():
         tokens = re.search(walltime_pattern, job_info["message"]).group(1).split(':')
         wall_time = int(tokens[0]) * 3600 + int(tokens[1]) * 60 + int(tokens[2])
         resources = int(re.search(resources_pattern, job_info["message"]).group(1))
-        queue = re.search(queue_pattern, job_info["message"]).group(1)
+        try:
+            queue = re.search(queue_pattern, job_info["message"]).group(1)
+        except AttributeError:
+            queue = "besteffort"
         try:
             karma = float(re.search(karma_pattern, job_info["message"]).group(1))
         except AttributeError: