Improved when Edrpou code not found