Added return statement on failure