Fixes parsing after 2.2 update

Fixed issues with parsing HTML after Patch 2.2. Working on using
exceptions for errors.