Added null handler (https://github.com/ConnectSDK/Connect-SDK-Android/issues/183)
Merge remote-tracking branch 'upstream/master'