Testing: minor fixes to previous + finally error output