Adjusting output + error handling.