Bulletproof

updates for GPE and a fix to a possible null pointer error