diff --git a/app/controllers/deadbolt/Deadbolt.java b/app/controllers/deadbolt/Deadbolt.java
index 95851d7..05dbbea 100644
--- a/app/controllers/deadbolt/Deadbolt.java
+++ b/app/controllers/deadbolt/Deadbolt.java
@@ -95,21 +95,26 @@ private static RoleHolder getRoleHolder()
     @Before
     static void checkRestrictions() throws Throwable
     {
-        DEADBOLT_HANDLER.beforeRoleCheck();
-
-        RoleHolder roleHolder = getRoleHolder();
         RestrictionType restrictionType = getRestrictionType();
-        if (restrictionType == RestrictionType.DYNAMIC)
-        {
-            handleDynamicChecks(roleHolder);
-        }
-        else if (restrictionType == RestrictionType.STATIC)
-        {
-            handleStaticChecks(roleHolder);
-        }
-        else if (restrictionType == RestrictionType.BASIC)
+
+        if (restrictionType != null && restrictionType != RestrictionType.NONE)
         {
-            handleRoleHolderPresent(roleHolder);
+            DEADBOLT_HANDLER.beforeRoleCheck();
+
+            RoleHolder roleHolder = getRoleHolder();
+
+            if (restrictionType == RestrictionType.DYNAMIC)
+            {
+                handleDynamicChecks(roleHolder);
+            }
+            else if (restrictionType == RestrictionType.STATIC)
+            {
+                handleStaticChecks(roleHolder);
+            }
+            else if (restrictionType == RestrictionType.BASIC)
+            {
+                handleRoleHolderPresent(roleHolder);
+            }
         }
     }