#464 - Cherrypicking and merging https://github.com/Akylas/mapbox-android-sdk/commit/ce5c46cd9710a084fe199343dab1099194898b4c
#464 - Cherrypicking and merging https://github.com/Akylas/mapbox-android-sdk/commit/82a3ffb0aa6ca2795efd19f7e75d77cd884e1cc4 to support original NPE solution in c8a5a5d8fb4220808c78201369cfaf8194c07913