8e060950d5
* Fix panic when progid by removing unwrap * Incorporate PR feedback
* Fix panic when progid by removing unwrap * Incorporate PR feedback