MEDIUM / Prevent NPE (fixed unit test)