980b2f053c
* commit '4802b4107a66bc86996083b4835d1094ef4f4cbb': Adding null-check before parsing an intent
* commit '4802b4107a66bc86996083b4835d1094ef4f4cbb': Adding null-check before parsing an intent