Fixed unhandled exception when crawling and various other things