Hotfix: Detect more fail cases.