Added non-compound paths & error checkng