Fix call to a member function is_restricted() on a non-object.
Merge branch 'ascraeus' into develop

* ascraeus:
  Fix call to a member function is_restricted() on a non-object.