Improved error handling in AdminType.