Issue 397 adding isset() checks
Merge branch 'develop' into issue-397a
Other code formatting
Merge pull request #398 from x-team/issue-397a

Issue 397 WPEngine Error