makes my tools page to handle bad data better
Merge branch 'develop'