npe exceptions added