Add extra generated block and extra checking

… to try to find problem occurring (only?) on Jenkins server