Added restoring/storing check of no records. Resolves #23