App update crash, invalid host crash
Merge pull request #242 from khawkins/bug_fixes

App update crash, invalid host crash