Add appropriate try/catch handling; fix a couple issues when running stand-alone (without YASMF)