Remove an obsolete XXX
Fix undefined variable in galaxy error handling