Bugfix attempt
Last Attempt
Bugfix for null location providers