Merge "Fixed invalid error message"