Return errors instead of log fataling them. Next step to reuasbility