Rescue from file not found
Merge branch 'devel' into v0.8-beta