diff --git a/module/VuFind/src/VuFind/Auth/LDAP.php b/module/VuFind/src/VuFind/Auth/LDAP.php
index 77a110bfdf2e7b46697ca8f255b509fd5c1e7464..ba852091c96798a91f7a5f4902a87e21d9229d6e 100644
--- a/module/VuFind/src/VuFind/Auth/LDAP.php
+++ b/module/VuFind/src/VuFind/Auth/LDAP.php
@@ -291,7 +291,7 @@ class LDAP extends AbstractBase
                         }
                         
                         if ($field != "cat_password") {
-                            $user->$field = $value;
+                            $user->$field = ($value === null) ? '' : $value;
                         } else {
                             $catPassword = $value;
                         }
diff --git a/module/VuFind/src/VuFind/Auth/Shibboleth.php b/module/VuFind/src/VuFind/Auth/Shibboleth.php
index e837f5089c9b8ab4bf77a2f5b372a8dbbf3d182b..9a948e56a881a837a6c7d699aa5651df6009894f 100644
--- a/module/VuFind/src/VuFind/Auth/Shibboleth.php
+++ b/module/VuFind/src/VuFind/Auth/Shibboleth.php
@@ -114,7 +114,7 @@ class Shibboleth extends AbstractBase
             if (isset($shib->$attribute)) {
                 $value = $request->getServer()->get($shib->$attribute);
                 if ($attribute != 'cat_password') {
-                    $user->$attribute = $value;
+                    $user->$attribute = ($value === null) ? '' : $value;
                 } else {
                     $catPassword = $value;
                 }
diff --git a/module/VuFind/src/VuFind/Content/Covers/Factory.php b/module/VuFind/src/VuFind/Content/Covers/Factory.php
index 51bfa872808ee1919e582d018c4c7cf9c12f0de3..d6834ba6b086da4df2c9e4ea7ecb407cb46365eb 100644
--- a/module/VuFind/src/VuFind/Content/Covers/Factory.php
+++ b/module/VuFind/src/VuFind/Content/Covers/Factory.php
@@ -69,7 +69,7 @@ class Factory
     {
         $config = $sm->getServiceLocator()->get('VuFind\Config')->get('config');
         $url = isset($config->Booksite->url)
-            ? $config->Booksite->url  : 'https://api.booksite.com';
+            ? $config->Booksite->url : 'https://api.booksite.com';
         if (!isset($config->Booksite->key)) {
             throw new \Exception("Booksite 'key' not set in VuFind config");
         }
diff --git a/module/VuFind/src/VuFind/Content/Reviews/Factory.php b/module/VuFind/src/VuFind/Content/Reviews/Factory.php
index 67f8591e003fa1d3018c6a13d488ab01c5f96e35..e791a326ffdae5c18f29887dd05abb16e938196a 100644
--- a/module/VuFind/src/VuFind/Content/Reviews/Factory.php
+++ b/module/VuFind/src/VuFind/Content/Reviews/Factory.php
@@ -110,7 +110,7 @@ class Factory
     {
         $config = $sm->getServiceLocator()->get('VuFind\Config')->get('config');
         $url = isset($config->Booksite->url)
-            ? $config->Booksite->url  : 'https://api.booksite.com';
+            ? $config->Booksite->url : 'https://api.booksite.com';
         if (!isset($config->Booksite->key)) {
             throw new \Exception("Booksite 'key' not set in VuFind config");
         }
diff --git a/module/VuFind/src/VuFind/Cover/Generator.php b/module/VuFind/src/VuFind/Cover/Generator.php
index 9cf248bcc39b262caef83e32d2b26429b109150a..aa859f70473a889208fdd09d35e7baa083d8dbd8 100644
--- a/module/VuFind/src/VuFind/Cover/Generator.php
+++ b/module/VuFind/src/VuFind/Cover/Generator.php
@@ -712,9 +712,9 @@ class Generator
 
         $bc = str_split($bc);
         for ($k = 0;$k < 4;$k++) {
-            $x = $k % 2   ? $halfWidth : $halfWidth - $boxWidth;
+            $x = $k % 2 ? $halfWidth : $halfWidth - $boxWidth;
             $y = $k / 2 < 1 ? $halfHeight : $halfHeight - $boxHeight;
-            $u = $k % 2   ? $boxWidth : -$boxWidth;
+            $u = $k % 2 ? $boxWidth : -$boxWidth;
             $v = $k / 2 < 1 ? $boxHeight : -$boxHeight;
             for ($i = 0;$i < 16;$i++) {
                 if ($bc[$i] == "1") {