Loads of error checking and slight fix.
Merge branch 'collisions' of github.com:DavidTruby/Sanguine into collisions