--- rpmlint.py
+++ rpmlint.py
@@ -190,7 +190,7 @@
               % (packages_checked, specfiles_checked,
                  printed_messages["E"], printed_messages["W"])
 
-    if printed_messages["E"] > 0:
+    if badnessThreshold() < 0 and printed_messages["E"] > 0:
         sys.exit(64)
     sys.exit(0)
 
--- Filter.py
+++ Filter.py
@@ -96,7 +96,7 @@
                 if len(last_reason):
                     printDescriptions(last_reason)
                 last_reason = reason
-        Pkg.rlprint(diag)
+        Pkg.rlprint(diag[:-1])
     if Config.info and len(last_reason):
         printDescriptions(last_reason)
     _diagnostic = list()