Catch problem with single location update, eliminate warnings.