Cleanup Error handling
more cleanup