Changed NS exception handling