[#6083] Bug fixes and update empty repo msg text

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
5 files changed