Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r15886 -r15998 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 15886) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 15998) @@ -2250,10 +2250,12 @@ position = ti.getSterilizerPosition(); if(StringUtils.isBlank(position)){ Long reviewBasketId = ti.getReviewBasket_id(); - ReviewedBasket reviewBasket = (ReviewedBasket) objectDao.getByProperty( - ReviewedBasket.class.getSimpleName(), "id", Long.valueOf(reviewBasketId)); - if(reviewBasket != null){ - position = reviewBasket.getSterilizerPosition(); + if(reviewBasketId != null ){ + ReviewedBasket reviewBasket = (ReviewedBasket) objectDao.getByProperty( + ReviewedBasket.class.getSimpleName(), "id", Long.valueOf(reviewBasketId)); + if(reviewBasket != null){ + position = reviewBasket.getSterilizerPosition(); + } } } if(StringUtils.isNotBlank(position)){