Added object check and fallback