Merge "NullPointerException handling, connectObexSession"