Improve NMAClient comments and exception messages