[#363] Fixes possible NPE when recomputing values