Added return statements for failures