[development] Better error-handling