Added error handling (poc). Set plan for version 1.0