Added some better gaurding to the Function Finder