Add error messages for userdata output failures
Merge branch 'dev'