Simplified conditional load check to avoid page build issues.
Merge pull request #26 from pjackson28/master

Simplified conditional load check to avoid page build issues