adding checks and actually much more
enabled mailings on errors
build