Added partition checks.