Added better error handling in the administration interface