v0.2.3: added a null safety check.