Add NullPointer Catch