Added error-handling (wip)