#1126 - Protect against NPE
#935 - Add missing entity definitions