Fix potential failure points.