Implement Stop/Dispose

Also add more error management