Improved guard clauses