Add safety against broken entries
Add workaround for pear package problem