Move condition checks to AccessControl.checkExecutionConditions() to avoid flow errors
Changed paths: