WIP: basic errors handling added