Bugfix: dictionary now returns null if key not found instead of
arbitrary int value