Fixed #5 - check content exists first!