Fix the error classes
Remove broken wrappers
Fix the alert