Adding additional error checking
Adding filter for facebook admin check