Add guard condition