- removing some exception swallowing due to hard debugging!