Add checks for not existing objects