Restructure server handlers
Update complete error message