Fix event command execution not calling finish handler

fixes #6856