Improved handling for not-found entries