change: generalize to use not local fs
change: improve exceptions handling