Fix an issue with hanging imports when handle.net API gives problems

[mworrell]

The code now adds timeouts, which fixes an issue with imports hanging indefinitely when handle.net gives no response.

Also refactored the code to be simpler.