Simplified output / error handling. #857