Fix: workaround for null/no block call