AE - Bug Fix - Fixed a NullPointerException.