Fixed an issue where a null value would crash