Return null instead of throwing exception, refs #267