[#51] Fixed error handling where finder method always returned nil