bug fix for empty handler#16

azplanlos wants to merge 2 commits intokgn:masterkgn/BBlock:masterfrom

azplanlos:masterazplanlos/BBlock:masterCopy head branch name to clipboard