Fixes

Catches 2 exceptions that were not catched, thus causing a trace to display.