Merge "Return with error logs instead of exception for unexpected nsi"