Additional error-check