Improved bad browser handling