Fixed issue with tools where common folder is set to null if not explicitly sett