Sorta fix HELO & improve error handler