Finally a way to handle resource not found