Data wrapper: refactored exceptions