correction of errorcatches and optimizied for uniserver