Added some checks to squelch errors if no entries