Moved exception handling to observers (where needed).