Added null object and interface for entry - more reliable code!