Issue #356 - Check for null duration values