Derp, add back in error checking code