Merge "Change error to warning"