closes #175 - Exception after rescan