BUGFIX: Check whether a Terms page exists before attempting to access it
BUGFIX: Correct instantiation of Email
Merge branch 'master' into theme

* master:
  BUGFIX: Correct instantiation of Email
  BUGFIX: Check whether a Terms page exists before attempting to access it