NORMAL CHANGE: Exception handling added.