More error work
Merge branch 'develop'