Updated Fe-0.7 handler again for null account references.