Add test for raising error for empty item
Add new error block
Merge old-state to fix testing