Parametrize error messages
More strict validation