Added safety checks to dependent methods