Better exception handling, added nfc service