Fixed import cycle
Fixed GetBlock when no block can be found