error handling added to EntryFactory