Fixes error message in merged changes from maint branch