Put a saftey check in the accessConditions
Merge pull request #571 from nla/ti_work_defects

Put a saftey check in the accessConditions