Remove some cascading errors