Re-rolled patch 2, Remove if condition from else statement. Please review.