Removed throw from scan & discovery methods