Feature/bucket errors