Improved error checking for 'effortdone' and 'effortleft'.