Added a null check, just in case