Fixed the Null peap bug
Hacky solution for google backend errors