Fixed 'parse first link twice' error
Cleaned up error handling
Cleaned up constraints on link collecting