Avoiding NPE when searching for an attr that's not there
Merge pull request #455 from delving/issues

Avoiding NPE when searching for an attr that's not there