More general param + exception handling improved.