Add guard clauses