Minor message edit; plus a correction to an if-else