Bug Fix - Null check on item not listed in db