Fine I missed that page when I was reading the doc on how to handle unregistration. I did some quick search and it the first few hits on InvalidRegistration were all about apns. I offered an observation that we were using the code for APNS instead of the Google code. You are right it needs to check for both of them. I'm wrong. Just send the PR