Added param check and some messages