Add error checking to some ignored places