Remove ServiceNotFoundException and add BlockNotFoundException