Fixed a null return