Removed some exception throws and used return false/null instead