adding more errors handling + updating mail server settings