Or, if all fails, you can use the CSS selector pseudo-class ':empty' and give it a 'display:none'. In practice, you add this line to your CSS:
p:empty {
display:none
}
I understand it's a dirty solution but it works perfectly in most cases and has minimal inpact on design and functionality.