Adjust behavior to work properly with non-existent graphite prefixes (should fix #87, fix #86)