Adds exception handling so errors don't break push