CORE-4270: fixed a problem that was causing a null pointer exception