Improving stability of system crawler suite