Improve message + error handling