Found potential for [Failure] bug in several other places. Preemptively fixed
Merge branch 'master' of https://github.com/UoYCS-plasma/GP2