[0.22.0] Error Checking Upgraded