Revert "Added throw exception"

This reverts commit fa4bf1fac38482349a594ab178d27d7d4d65b289.