Make exception more specific and throw only when site was invalid