Fixed admin bug where obscure 500 errors were thrown