Added getDiskByIdorNull method