Removed nullpointed exception