refine error handling
refine message.properties