Fixed leak, added NYI exception