Added specific exceptions for partner not found and reserved keywords.