UPDATE #6

Better exception handling, added timer