Testing fix #1 for "TypeError: argument of type 'NoneType' is not iterable" 500 error