Less exception message & simple code refine