Added return checks.