Fix empty dispatcher access