Improved error handling if category request fails.
Minor tweaks