Fix 'NoneType' errors in console