Generate siteinfo records automatically and handle error better