Added another clause in case the onLocationChanged returns null, get the last know location