* Only refresh metadata on success (#672)

Implements changes discussed and agreed in GitHub issue.

* Second draft solution to issue 672

* Create unit test to detect issue 672

* Check for nil event in test 672