Merge "Fixed up a missing space in an error message"