Note on the pre-existing code: getExtras() can return null, so line 68 needs a null check.