Patch to avoid setting null location data to client (Issue #4)