Hacky CPP support
Made hack work for errors with filename