Added NS related errors and fixed some issues.