Re #987 - Avoid NPE in Fullbean