s3:net registry import: check return values + codecleanup