Code now throwing exceptions on failure