Removing _site
Adding error checking
Reduced error checking