development: Fixed unreachable return statement