diff --git a/README.rst b/README.rst
index 9a264a0db4beddafbdc3bca1205fe16c839fac58..2a6b7da769d0495ea41b70157745fdebc3d77597 100644
--- a/README.rst
+++ b/README.rst
@@ -15,9 +15,9 @@ Relate is an Environment for Learning And TEaching
 .. image:: https://ci.appveyor.com/api/projects/status/d5bigdw90bxnfdgy?svg=true
     :alt: Appveyor CI Status
     :target: https://ci.appveyor.com/project/inducer/relate
-.. image:: https://badge.fury.io/py/relate.png
+.. image:: https://badge.fury.io/py/relate-courseware.png
     :alt: Python Package Index Release Page
-    :target: https://pypi.org/project/relate/
+    :target: https://pypi.org/project/relate-courseware/
 
 +----------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------+
 | .. image:: https://raw.githubusercontent.com/inducer/relate/master/doc/images/screenshot.png | .. image:: https://raw.githubusercontent.com/inducer/relate/master/doc/images/screenshot-2.png |
diff --git a/accounts/models.py b/accounts/models.py
index 92a6e259130206c29cca2f6a433b45281d5324cc..678398c9390e80026a0ce2313370b88c7d386c2f 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -180,7 +180,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         # Intentionally don't fallback if it failed -- let user see the exception.
         result = mask_method(self)
         if not result:
-            raise RuntimeError("get_masked_profile should not None.")
+            raise RuntimeError("get_masked_profile should not return None.")
         else:
             result = str(result).strip()
         if not result:
diff --git a/tests/test_grades/test_csv.py b/tests/test_grades/test_csv.py
index 9fceb06caa56165287ac5434d68eca3c84a1329b..2cc6337a5ebdf249ed3da2d89e3c97154fbf94ff 100644
--- a/tests/test_grades/test_csv.py
+++ b/tests/test_grades/test_csv.py
@@ -413,8 +413,7 @@ class ImportGradesTest(GradesTestMixin, TestCase):
 
     def test_import_file_error(self):
         expected_file_error_msg = (
-            "Error: line contains NULL byte. Are you sure the file is a "
-            "CSV file other than a Microsoft Excel file?")
+            "Error: line contains NUL")
 
         with open(
                 os.path.join(CSV_PATH, 'test_import_excel_failed.xlsx'),