Guard against a null manifest.
Merge pull request #508 from JakeWharton/jw/null-manifest

Guard against a null manifest.