EB-615 - Invalid user agent exception

Please do not merge.