lrlebrao esfaust Adds some error catching
lrlebra Fixes merge conflicts