CS-4921: Removes blank line after if statement
CS-4921: Fixes indentation > tabs to spaces
CS-4921: Fixes indentation inconsistencies and adds exception instead of die