master bugfix
master renaming of the error module