Catches specific exception & updates error logging

[janakerman]

We should allow unexpected exceptions to bubble up and only catch exceptions that we expect to occur.