[BUGFIX] Ensure most site related exceptions are handled