Add some support for malformed package names

At least it doesn't break?