skip already synced files + npe fixes