Minor changes to handling failure