4335 pull from staging

custom exception?