* Added more safety checks