Device search is now working properly / handling errors