adding null check for peek service, fixes issue #2