Added more fail error messaging