Improved timeout error passing
Fixed trying to query with deleted map ID