Issue #13
 - Trim to empty to avoid NPE