Minor interpreter changes and error catching