Some more error detection