Correct for scenario when apricot lib files are in different dir
Correct error when attempting to use current on empty collection