diff --git a/src/Api.php b/src/Api.php
index <HASH>..<HASH> 100644
--- a/src/Api.php
+++ b/src/Api.php
@@ -40,11 +40,11 @@
 
 			$this->loadWhitelist();
 
-			if ($this->checkWhitelist() === false)
+			if (isset($this->request->headers->authorization) && !empty($this->request->headers->authorization()))
 			{
 				try
 				{
-					$this->authenticate();
+					$this->authenticate($this->checkWhitelist());
 				}
 				catch (Exceptions\Authentication $exception)
 				{
Efficiency improvements to whitelist/authentication system

Always process auth header if it exists
Pass whitelisted state to authenticate method