fix #51, align error message checks with new error messages