Improved error handling admintool