More defensive analysis