Improved error message and fixed a block acquisition problem.