Added 401 handling.
Merge branch 'mod_error_handling' into admin_manage