change type of exception
add test for block location returning 1+ location
switching back to the (broken) location code