Merge "Added missing space on error message." into sc-dev