Fix longstanding embed null bug. Closes #404.