Possible to enter P/D and added exception handling.