Added proper not found exception.