Improve error handling
nl