Debris error handling fix