Consolidate method call, better fail handling