Add additional error-check.