Make dictionary returns safe