fix: Error handler bugs.