Error awareness
refuctored