BRANCH SP-1043:
  delete kwargs.on_complete and kwargs.on_error only if kwargs is defined
Merge pull request #89 from Southpaw-TACTIC/SP-1043

BRANCH SP-1043: