Improved catchers with proper stacktraces