Add location sub and eval{} structure for catching errors