Added basic handling of incorrect urls in parser