Add guard to detect if block is given