Added returns for errors