Error handling and fixes for newsite