First Pull Request

You may remove ```break;``` here as you throw an Exception before po :smiley: :bow: 
> Applicable to other switch statements :bow: