Merge "Remove "properly" from error message for clarity"