Added try block
Merge branch 'origin/master'
Undid some stuff programmers did like the commenting out of append