Handle urllib2.URLError and JSON decode errors
Merge commit 'e0442f0'

* commit 'e0442f0':
  Handle urllib2.URLError and JSON decode errors

Conflicts:
	bom_generator.py