Check for errors more thoroughly