Change error type, move options description