diff --git a/app/controllers/concerns/submission_scoring.rb b/app/controllers/concerns/submission_scoring.rb
index 35de4ba5..f90b16ee 100644
--- a/app/controllers/concerns/submission_scoring.rb
+++ b/app/controllers/concerns/submission_scoring.rb
@@ -9,7 +9,7 @@ module SubmissionScoring
         assessment = assessor.assess(output)
         passed = ((assessment[:passed] == assessment[:count]) and (assessment[:score] > 0))
         testrun_output = passed ? nil : 'message: ' + output[:message].to_s + "\n stdout: " + output[:stdout].to_s + "\n stderr: " + output[:stderr].to_s
-        if !testrun_output.blank?
+        unless testrun_output.blank?
           submission.exercise.execution_environment.error_templates.each do |template|
             pattern = Regexp.new(template.signature).freeze
             if pattern.match(testrun_output)
diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 73db8c25..2fa518ec 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -203,11 +203,11 @@ class SubmissionsController < ApplicationController
   end
 
   def extract_errors
-    if !@message_buffer.blank?
+    unless @run_output.blank?
       @submission.exercise.execution_environment.error_templates.each do |template|
         pattern = Regexp.new(template.signature).freeze
-        if pattern.match(@message_buffer)
-          StructuredError.create_from_template(template, @message_buffer)
+        if pattern.match(@run_output)
+          StructuredError.create_from_template(template, @run_output)
         end
       end
     end