updates for 2.5; adds null check for block_get_content();