CVS commit by staikos: do the memory check earlier, make it more correct M +57 -34 datawizard.ui.h 1.76