add: catch exception if file not found
Merge branch 'freeze' into develop