diff --git a/lam/lib/cache.inc b/lam/lib/cache.inc
index a52ca548..b1bf97d5 100644
--- a/lam/lib/cache.inc
+++ b/lam/lib/cache.inc
@@ -230,6 +230,7 @@ class cache {
 				}
 			}
 		}
+		return null;
 	}
 
 
diff --git a/lam/lib/types/user.inc b/lam/lib/types/user.inc
index ae9790ba..51b8e5bb 100644
--- a/lam/lib/types/user.inc
+++ b/lam/lib/types/user.inc
@@ -222,13 +222,11 @@ class lamUserList extends lamList {
 	 * @return lamListTool[] tools
 	 */
 	protected function getAdditionalTools() {
-		if (!isLAMProVersion()) {
-			return array();
-		}
-		elseif (checkIfPasswordChangeIsAllowed()) {
+		if (isLAMProVersion() && checkIfPasswordChangeIsAllowed()) {
 			$passwordTool = new lamListTool(_('Change password'), 'key.png', 'changePassword.php');
 			return array($passwordTool);
 		}
+		return array();
 	}
 
 	/**