updated collision threshold values
more if clause guards for when location data is null
more checking for null objects that shouldn't be null
more checking for null objects that shouldn'be null