Fix 1593 block warning

This fixes the problem where a block within a block results in a warning sometimes.  It also fixes a problem where the line number is not displayed for that warning.