Better messaging. #751