And make it slightly stronger (it now checks something that should be
mostly obvious too, but who knows, with software).