diff --git a/src/PopupDialog.js b/src/PopupDialog.js
index <HASH>..<HASH> 100644
--- a/src/PopupDialog.js
+++ b/src/PopupDialog.js
@@ -26,19 +26,11 @@ class PopupDialog extends Component {
 	}
 	
 	openDialog(onOpened) {
-		if (onOpened && typeof onOpened == 'function') {
-			this.dialog.open(onOpened);
-		} else {
-			this.dialog.open();
-		}
+		this.dialog.open(onOpened);
 	}
 	
 	closeDialog(onClosed) {
-		if (onClosed && typeof onClosed == 'function') {
-			this.dialog.closed(onClosed);
-		} else {
-			this.dialog.closed();
-		}
+		this.dialog.closed(onClosed);
 	}
 	
 	render() {
diff --git a/src/components/Dialog.js b/src/components/Dialog.js
index <HASH>..<HASH> 100644
--- a/src/components/Dialog.js
+++ b/src/components/Dialog.js
@@ -79,7 +79,7 @@ class Dialog extends Component {
 		setTimeout(() => {
 			dialogState = dialogState === 'closing' ? 'closed' : 'opened';
 			this.setState({dialogState});
-			if (callback) callback();
+			if (callback && typeof callback === 'function') callback();
 		}, this.props.animationDuration);
 	}
:rocket: move function check from the exported component to the inner logic