Minor changes to Output and exception handling