Moved all per website errors to different error collection method