Refactor error handling code for Main_Init()
Merge branch 'master' of github.com:lidavidm/c-heck-yeah