=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java 2015-10-14 09:35:22 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java 2015-10-15 08:07:42 +0000 @@ -553,13 +553,18 @@ @Override public boolean hasAnyAuthority( String... authorities ) { - UserCredentials userCredentials = currentUserService.getCurrentUser().getUserCredentials(); - - for ( String authority : authorities ) + User user = currentUserService.getCurrentUser(); + + if ( user != null && user.getUserCredentials() != null ) { - if ( userCredentials.isAuthorized( authority ) ) + UserCredentials userCredentials = user.getUserCredentials(); + + for ( String authority : authorities ) { - return true; + if ( userCredentials.isAuthorized( authority ) ) + { + return true; + } } }