Improved pairing
Now stops provider if it cannot start