#489 - 3.0.4 Miscellaneous Improvements. Protect against potential NPE.