add check for null to parsing layer name (watson 3652952)