Build improvement - file not found exception catched