Cleanup: Check return value