wrap original exceptions again to preserve original stack trace
remove deprecated calls
added a FIXME