Removed return on failed logic temporarily (for testing).