diff --git a/Makefile b/Makefile
index f1ee0b813e3..1fbbab9a121 100644
--- a/Makefile
+++ b/Makefile
@@ -66,11 +66,13 @@ lint: ## Runs all lint tests
 	@echo "--- erb-lint ---"
 	make lint_erb
 	@echo "--- rubocop ---"
+	mkdir -p tmp
 ifdef JUNIT_OUTPUT
-	bundle exec rubocop --parallel --format progress --format junit --out rubocop.xml --display-only-failed
+	bundle exec rubocop --parallel --format progress --format junit --out rubocop.xml --display-only-failed --color 2> tmp/rubocop.txt
 else
-	bundle exec rubocop --parallel
+	bundle exec rubocop --parallel --color 2> tmp/rubocop.txt
 endif
+	awk 'NF {exit 1}' tmp/rubocop.txt || (printf "Error: Unexpected stderr output from Rubocop\n"; cat tmp/rubocop.txt; exit 1)
 	@echo "--- analytics_events ---"
 	make lint_analytics_events
 	make lint_analytics_events_sorted
diff --git a/lib/identity_config.rb b/lib/identity_config.rb
index 3ae9f6fcfa6..b859c70528b 100644
--- a/lib/identity_config.rb
+++ b/lib/identity_config.rb
@@ -15,7 +15,7 @@ def self.store
 
   # identity-hostdata transforms these configs to the described type
   # rubocop:disable Metrics/BlockLength
-  # rubocop:disable Metrics/LineLength
+  # rubocop:disable Layout/LineLength
   BUILDER = proc do |config|
     #  ______________________________________
     # / Adding something new in here? Please \
@@ -472,6 +472,6 @@ def self.store
     config.add(:vtm_url)
     config.add(:weekly_auth_funnel_report_config, type: :json)
   end.freeze
-  # rubocop:enable Metrics/LineLength
+  # rubocop:enable Layout/LineLength
   # rubocop:enable Metrics/BlockLength
 end