Merge pull request #26 from remia/fix/st_wrap_error_diagnostic