Updating to match wordpress.org and HpsException to fix PHP 5.2 bug