ION: Added some error handling