Clean up exceptions and fix update method