fix bug 1044068 - Prevent 'Cannot call execute of null' errors