Apply some of the pieces of advice given by the awesome new Lint
Add a couple checks regarding NFC availability